From 6d9f01ab8d5b81a8f4fd536efeb4dcbebb68b458 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 7 Jul 2013 21:21:50 +0000 Subject: [PATCH 1/7] Added a comment: Reason found --- ...comment_2_df05456cafdd89e8ceea830199f42d45._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/Adding_git_ssh_remote_fails/comment_2_df05456cafdd89e8ceea830199f42d45._comment diff --git a/doc/bugs/Adding_git_ssh_remote_fails/comment_2_df05456cafdd89e8ceea830199f42d45._comment b/doc/bugs/Adding_git_ssh_remote_fails/comment_2_df05456cafdd89e8ceea830199f42d45._comment new file mode 100644 index 0000000000..89e9523b3a --- /dev/null +++ b/doc/bugs/Adding_git_ssh_remote_fails/comment_2_df05456cafdd89e8ceea830199f42d45._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="Chris" + ip="89.14.216.1" + subject="Reason found" + date="2013-07-07T21:21:49Z" + content=""" +I found the reason for the behavior. On the server, for non-interactive login shells, the right path to git-annex was not set and an old version that was installed by the OS was used instead. I've put the \"export $PATH\" at the right position in .bashrc and now it works. Sorry for the noise. + +Best regards, Chris +"""]] From 181336f337e2cc98ecb122dc1b6cf435983ab30c Mon Sep 17 00:00:00 2001 From: "2.244.19.79" <2.244.19.79@web> Date: Sun, 7 Jul 2013 22:42:12 +0000 Subject: [PATCH 2/7] poll vote (Google Drive) --- doc/design/assistant/polls/prioritizing_special_remotes.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn index faa400f498..d3e1c432ef 100644 --- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn +++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn @@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync. Help me prioritize my work: What special remote would you most like to use with the git-annex assistant? -[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 70 "My phone (or MP3 player)" 19 "Tahoe-LAFS" 7 "OpenStack SWIFT" 30 "Google Drive"]] +[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 70 "My phone (or MP3 player)" 19 "Tahoe-LAFS" 7 "OpenStack SWIFT" 31 "Google Drive"]] This poll is ordered with the options I consider easiest to build listed first. Mostly because git-annex already supports them and they From d6e992b308f02733c549da52f98c4ead4b427149 Mon Sep 17 00:00:00 2001 From: "98.64.216.229" <98.64.216.229@web> Date: Mon, 8 Jul 2013 02:59:30 +0000 Subject: [PATCH 3/7] poll vote (/sdcard/annex) --- doc/design/assistant/polls/Android_default_directory.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index acbf48247b..0da704e03b 100644 --- a/doc/design/assistant/polls/Android_default_directory.mdwn +++ b/doc/design/assistant/polls/Android_default_directory.mdwn @@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they want the first time they run it, but to save typing on android, anything that gets enough votes will be included in a list of choices as well. -[[!poll open=yes expandable=yes 52 "/sdcard/annex" 5 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] +[[!poll open=yes expandable=yes 53 "/sdcard/annex" 5 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] From 333365cafad8243a9e9c64c20c8ae641acd4cf9d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk1MwAbPhkvUfU6duYaUnLFC_PXI2VfwtE" Date: Mon, 8 Jul 2013 07:20:04 +0000 Subject: [PATCH 4/7] add a step to make sure that $HOME/bin exists - this tripped me up. --- doc/install/OSX.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn index 68e4a53d9c..e01ed93f23 100644 --- a/doc/install/OSX.mdwn +++ b/doc/install/OSX.mdwn @@ -39,6 +39,7 @@ brew update brew install haskell-platform git ossp-uuid md5sha1sum coreutils libgsasl gnutls libidn libgsasl pkg-config libxml2 brew link libxml2 cabal update +mkdir $HOME/bin PATH=$HOME/bin:$PATH PATH=$HOME/.cabal/bin:$PATH cabal install c2hs --bindir=$HOME/bin From 714a3aaba0e0dd5ae060849e38ccd251a08eb30f Mon Sep 17 00:00:00 2001 From: mildred Date: Mon, 8 Jul 2013 13:27:22 +0000 Subject: [PATCH 5/7] Added a comment: What happens to object database in direct mode? --- ...comment_5_42363bf0367f935b3eee8ad3d2eaf5cf._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/direct_mode/comment_5_42363bf0367f935b3eee8ad3d2eaf5cf._comment diff --git a/doc/direct_mode/comment_5_42363bf0367f935b3eee8ad3d2eaf5cf._comment b/doc/direct_mode/comment_5_42363bf0367f935b3eee8ad3d2eaf5cf._comment new file mode 100644 index 0000000000..d4e2962a64 --- /dev/null +++ b/doc/direct_mode/comment_5_42363bf0367f935b3eee8ad3d2eaf5cf._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="mildred" + ip="2a01:e35:2f7b:8350:225:22ff:fe40:fdfc" + subject="What happens to object database in direct mode?" + date="2013-07-08T13:27:21Z" + content=""" +What happens to the object database (`.git/annex/objects`) when going to direct mode? Are the objects deleted, moved to another location, kept? + +If the objects are kept, does it means that the file on the repository in direct mode is duplicated in the object database? If so, would it be relevant to use `cp --reflink=auto` to populate the working directory to enable copy on write on filesystems that supports it? +"""]] From f3bfd27d4e4df62d16aa4f44acb318e6f31490dd Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm01ida6POv7vqyUYtOlymEbJTbrImAIzM" Date: Mon, 8 Jul 2013 15:01:30 +0000 Subject: [PATCH 6/7] --- ...l_doesn__39__t_create_git-annex-shell.mdwn | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn diff --git a/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn b/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn new file mode 100644 index 0000000000..1bcd373697 --- /dev/null +++ b/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn @@ -0,0 +1,60 @@ +### Please describe the problem. +There is no git-annex-shell command in path and thus sync with ssh server fails. If I symlink /usr/bin/git-annex-shell -> /usr/bin/git-annex, it complains that key is already present in annex and errors out. There is executable git-annex-shell in server's ~/.ssh/ + +### What steps will reproduce the problem? +Start webapp to sync local repo with ssh server. + +### What version of git-annex are you using? On what operating system? +git-annex 4.20130627 on Gentoo + +### Please provide any additional information below. + +[[!format sh """ +# If you can, paste a complete transcript of the problem occurring here. +# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log + +[2013-07-08 17:28:48 EEST] main: starting assistant version 4.20130627 +[2013-07-08 17:28:49 EEST] TransferScanner: Syncing with netbook_Lit, sigma_Lit + + dbus failed; falling back to mtab polling (SocketError {socketErrorMessage = "connect: does not exist (Connection refused)", socketErrorFatal = True, socketErrorAddress = Just (Address "unix:abstract=/tmp/dbus-HBxh6EyMJ3,guid=adc3101676daede2a128013351daa535")}) +Already up-to-date. + +(scanning...) [2013-07-08 17:28:49 EEST] Watcher: Performing startup scan +Already up-to-date. +Already up-to-date. + + +(started...) Everything up-to-date +Everything up-to-date +bash: git-annex-shell: command not found +rsync: connection unexpectedly closed (0 bytes received so far) [sender] +rsync error: remote command not found (code 127) at io.c(605) [sender=3.0.9] +bash: git-annex-shell: command not found +rsync: connection unexpectedly closed (0 bytes received so far) [sender] +rsync error: remote command not found (code 127) at io.c(605) [sender=3.0.9] + + +[2013-07-08 17:50:23 EEST] main: starting assistant version 4.20130627 +[2013-07-08 17:50:23 EEST] TransferScanner: Syncing with netbook_Lit, sigma_Lit + + dbus failed; falling back to mtab polling (SocketError {socketErrorMessage = "connect: does not exist (Connection refused)", socketErrorFatal = True, socketErrorAddress = Just (Address "unix:abstract=/tmp/dbus-HBxh6EyMJ3,guid=adc3101676daede2a128013351daa535")}) +Already up-to-date. + +(scanning...) [2013-07-08 17:50:23 EEST] Watcher: Performing startup scan +Already up-to-date. +Already up-to-date. + + +(started...) Everything up-to-date +Everything up-to-date +git-annex-shell: key is already present in annex +rsync: connection unexpectedly closed (0 bytes received so far) [sender] +rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender=3.0.9] +git-annex-shell: key is already present in annex +rsync: connection unexpectedly closed (0 bytes received so far) [sender] +rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender=3.0.9] + + + +# End of transcript or log. +"""]] From c2f1f8dda4ac0da9cdd902fed93cfdf9c945dceb Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Mon, 8 Jul 2013 16:11:32 +0000 Subject: [PATCH 7/7] Added a comment --- .../comment_6_5f03b1686c1fb3f7606a5bc724ac3812._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/direct_mode/comment_6_5f03b1686c1fb3f7606a5bc724ac3812._comment diff --git a/doc/direct_mode/comment_6_5f03b1686c1fb3f7606a5bc724ac3812._comment b/doc/direct_mode/comment_6_5f03b1686c1fb3f7606a5bc724ac3812._comment new file mode 100644 index 0000000000..1cdb9a79c7 --- /dev/null +++ b/doc/direct_mode/comment_6_5f03b1686c1fb3f7606a5bc724ac3812._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.153.254.222" + subject="comment 6" + date="2013-07-08T16:11:32Z" + content=""" +`.git/annex/objects` does not typically contain any file contents in direct mode. The file contents are stored directly in the working tree. +"""]]