diff options
author | 2014-07-24 16:49:45 -0400 | |
---|---|---|
committer | 2014-07-24 16:49:45 -0400 | |
commit | f2dc261406dc825c6a2e8306d3f7bbc507ecc63f (patch) | |
tree | 0fbd5f997a698a3f32f29e0406a54d8606d5dfb2 | |
parent | 443d851f2e2dbb013e31b9a72a72cda3da46fb3a (diff) | |
parent | 6e9585cd7d00137fc9476469f4f8cec3bd172e7e (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
5 files changed, 52 insertions, 0 deletions
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 000000000..5808c5644 --- /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. +"""]] 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 000000000..2dd988501 --- /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. +"""]] 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 000000000..de6dd6e49 --- /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. diff --git a/doc/install.mdwn b/doc/install.mdwn index 4c2712855..493fdea58 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 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 000000000..314c283bf --- /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. |