From 7eb483156df0bd860fb1c3167421b332ef32f162 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 23 Jul 2014 22:10:37 +0000 Subject: [PATCH 1/5] Added a comment --- ...comment_1_4d1b96911e3e227c7433ccea543872c1._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41_____91__2014-07-23_16:41:45_CEST__93___WebApp:_warning_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41__/comment_1_4d1b96911e3e227c7433ccea543872c1._comment diff --git a/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41_____91__2014-07-23_16:41:45_CEST__93___WebApp:_warning_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41__/comment_1_4d1b96911e3e227c7433ccea543872c1._comment b/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41_____91__2014-07-23_16:41:45_CEST__93___WebApp:_warning_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41__/comment_1_4d1b96911e3e227c7433ccea543872c1._comment new file mode 100644 index 0000000000..5808c56446 --- /dev/null +++ b/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41_____91__2014-07-23_16:41:45_CEST__93___WebApp:_warning_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41__/comment_1_4d1b96911e3e227c7433ccea543872c1._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="24.159.78.125" + subject="comment 1" + date="2014-07-23T22:10:37Z" + content=""" +Support for --listen with a port was removed in version 5.20140306, since it was buggy. In particular, when the webapp creates a new repository, it needs to switch to a new port to serve that repository, so specifying a single port won't work. + +Instead, when annex.listen or --listen specifies the address to listen on, `git annex webapp` will print out the url to use to open it, including the port it picked. This could be used in a script, or clicked on in the terminal to open a local browser when running the webapp on a remote host. +"""]] From 6df94fb4899cae998bc9e01069e6497e0a2a6204 Mon Sep 17 00:00:00 2001 From: markusk Date: Wed, 23 Jul 2014 23:18:37 +0000 Subject: [PATCH 2/5] Added a comment --- .../comment_2_7be98a630e1deb655a4d1675bf622d05._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41_____91__2014-07-23_16:41:45_CEST__93___WebApp:_warning_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41__/comment_2_7be98a630e1deb655a4d1675bf622d05._comment diff --git a/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41_____91__2014-07-23_16:41:45_CEST__93___WebApp:_warning_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41__/comment_2_7be98a630e1deb655a4d1675bf622d05._comment b/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41_____91__2014-07-23_16:41:45_CEST__93___WebApp:_warning_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41__/comment_2_7be98a630e1deb655a4d1675bf622d05._comment new file mode 100644 index 0000000000..2dd9885016 --- /dev/null +++ b/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41_____91__2014-07-23_16:41:45_CEST__93___WebApp:_warning_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known__41__/comment_2_7be98a630e1deb655a4d1675bf622d05._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="markusk" + ip="79.243.250.79" + subject="comment 2" + date="2014-07-23T23:18:37Z" + content=""" +Thank you for the info! Will add the port grep to my auth grep script as you suggested. +"""]] From 46fec9c1ce3c61389b7128fa86a571481b8a73f4 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmp_51DcIT2sqrOhtg7LgCj2Pyaa5ujxTI" Date: Wed, 23 Jul 2014 23:38:55 +0000 Subject: [PATCH 3/5] --- .../local_subtree_and_broken_symlinks.mdwn | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 doc/forum/local_subtree_and_broken_symlinks.mdwn diff --git a/doc/forum/local_subtree_and_broken_symlinks.mdwn b/doc/forum/local_subtree_and_broken_symlinks.mdwn new file mode 100644 index 0000000000..de6dd6e491 --- /dev/null +++ b/doc/forum/local_subtree_and_broken_symlinks.mdwn @@ -0,0 +1,21 @@ +Here's a simple example on a repository with three branches, where we'll be adding images-annex as a subtree into master. + + $ git branch + git-annex + images-annex + * master + $ git subtree add --squash --prefix=images/ images-annex + Added dir 'images' + $ ls + FILE_A FILE_B images/ + +...checkout images-annex, make changes, commit... + + $ git checkout master + $ git subtree pull --squash --prefix=images/ . images-annex + From . + * branch images-annex -> FETCH_HEAD + Merge made by the 'recursive' strategy. + ...(files created/modified/etc) + +I have tried a few different methods for merging the subtree in and so far have not been able to keep git-annex links up to date. Running `git-annex fix .` does what it's supposed to but then git sees everything as modified. Is this entirely the expected behavior because of the --prefix? I have not used subtrees much before but the model appears to be very helpful for what I'm trying to do. From a42d2a6e4bf61b5d1db901d2034c4e05e8495e1e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlASRUX9jg2piT1lge4KkBU_ZGty6tvM5c" Date: Thu, 24 Jul 2014 00:48:33 +0000 Subject: [PATCH 4/5] added gpg instructions --- doc/install.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/install.mdwn b/doc/install.mdwn index 4c27128554..493fdea58d 100644 --- a/doc/install.mdwn +++ b/doc/install.mdwn @@ -19,6 +19,12 @@ detailed instructions | quick install [[Windows]] | [download installer](http://downloads.kitenet.net/git-annex/windows/current/) **alpha** """]] +The downloaded package's integrity can be verified by the public PGP key. On Linux, + + $ wget https://downloads.kitenet.net/git-annex/gpg-pubkey.asc + $ gpg --import gpg-pubey.asc + $ gpg --verify git-annex-standalone-*.tar.gz.sig + ## Using cabal As a haskell package, git-annex can be installed from source pretty easily From d0ea0a04797718f2cec647a14e70f9c742c38626 Mon Sep 17 00:00:00 2001 From: Xyem Date: Thu, 24 Jul 2014 12:31:31 +0000 Subject: [PATCH 5/5] --- .../Deduplicate_archive___40__i.e._zip__41___files.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/todo/Deduplicate_archive___40__i.e._zip__41___files.mdwn diff --git a/doc/todo/Deduplicate_archive___40__i.e._zip__41___files.mdwn b/doc/todo/Deduplicate_archive___40__i.e._zip__41___files.mdwn new file mode 100644 index 0000000000..314c283bf9 --- /dev/null +++ b/doc/todo/Deduplicate_archive___40__i.e._zip__41___files.mdwn @@ -0,0 +1,7 @@ +I've just come across this issue and I'm not sure if git-annex is the right place to put it, but in case it is easy enough to do.. may as well ask! + +In this scenario, an online service (Bandcamp), automatically creates the archive file when downloading an album each and every time you download it. This results in identical files inside a zip, but different hashes due to the slightly different timestamps on the archive itself. + +Would it be possible for git-annex to be able to detect this scenario (in a manner similar to zipcmp) and redirect an add/import to the already existing copy? + +I've found this due to trying to decommission an old annex by `git annex import --clean-duplicates ~/annex_old/.git/annex/objects` and finding these files being left.