From 065e1a507b74e8e41017a1a5368fc2b8aaac7f19 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm4or5sJLWB0evPKp70Q2OND-JmFPnOkLA" Date: Tue, 9 Aug 2011 13:00:21 +0000 Subject: [PATCH 1/6] --- .../--git-dir_and_--work-tree_options.mdwn | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/bugs/--git-dir_and_--work-tree_options.mdwn diff --git a/doc/bugs/--git-dir_and_--work-tree_options.mdwn b/doc/bugs/--git-dir_and_--work-tree_options.mdwn new file mode 100644 index 0000000000..2e5d1cf0c8 --- /dev/null +++ b/doc/bugs/--git-dir_and_--work-tree_options.mdwn @@ -0,0 +1,28 @@ +git-annex does not take into account the --git-dir and --work-tree command line options (while they can be useful when scripting). + +> mkdir /tmp/test +> cd /tmp/test +> git init +Initialized empty Git repository in /tmp/test/.git/ +> git annex init test +init test ok +> touch foo +> cd +> git --git-dir=/tmp/test/.git --work-tree=/tmp/test annex add foo +git-annex: Not in a git repository. + +regular git add works: +> git --git-dir=/tmp/test/.git --work-tree=/tmp/test add foo +> git --git-dir=/tmp/test/.git --work-tree=/tmp/test status +# On branch master +# +# Initial commit +# +# Changes to be committed: +# (use "git rm --cached ..." to unstage) +# +# new file: foo +# + +git-annex version: 3.20110702 + From 1e934c29d66f44ff074a9d02004e2bd6abb90462 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm4or5sJLWB0evPKp70Q2OND-JmFPnOkLA" Date: Tue, 9 Aug 2011 13:02:32 +0000 Subject: [PATCH 2/6] --- .../--git-dir_and_--work-tree_options.mdwn | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/doc/bugs/--git-dir_and_--work-tree_options.mdwn b/doc/bugs/--git-dir_and_--work-tree_options.mdwn index 2e5d1cf0c8..ebae56b049 100644 --- a/doc/bugs/--git-dir_and_--work-tree_options.mdwn +++ b/doc/bugs/--git-dir_and_--work-tree_options.mdwn @@ -1,28 +1,29 @@ git-annex does not take into account the --git-dir and --work-tree command line options (while they can be useful when scripting). -> mkdir /tmp/test -> cd /tmp/test -> git init -Initialized empty Git repository in /tmp/test/.git/ -> git annex init test -init test ok -> touch foo -> cd -> git --git-dir=/tmp/test/.git --work-tree=/tmp/test annex add foo -git-annex: Not in a git repository. + > mkdir /tmp/test + > cd /tmp/test + > git init + Initialized empty Git repository in /tmp/test/.git/ + > git annex init test + init test ok + > touch foo + > cd + > git --git-dir=/tmp/test/.git --work-tree=/tmp/test annex add foo + git-annex: Not in a git repository. regular git add works: -> git --git-dir=/tmp/test/.git --work-tree=/tmp/test add foo -> git --git-dir=/tmp/test/.git --work-tree=/tmp/test status -# On branch master -# -# Initial commit -# -# Changes to be committed: -# (use "git rm --cached ..." to unstage) -# -# new file: foo -# + + > git --git-dir =/tmp/test/.git --work-tree=/tmp/test add foo + > git --git-dir=/tmp/test/.git --work-tree=/tmp/test status + # On branch master + # + # Initial commit + # + # Changes to be committed: + # (use "git rm --cached ..." to unstage) + # + # new file: foo + # git-annex version: 3.20110702 From 20a8f8c85bbda5d8af90782a596abbb1b0ac1e86 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm4or5sJLWB0evPKp70Q2OND-JmFPnOkLA" Date: Tue, 9 Aug 2011 13:04:34 +0000 Subject: [PATCH 3/6] --- doc/bugs/--git-dir_and_--work-tree_options.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/--git-dir_and_--work-tree_options.mdwn b/doc/bugs/--git-dir_and_--work-tree_options.mdwn index ebae56b049..d76a42bfff 100644 --- a/doc/bugs/--git-dir_and_--work-tree_options.mdwn +++ b/doc/bugs/--git-dir_and_--work-tree_options.mdwn @@ -13,7 +13,7 @@ git-annex does not take into account the --git-dir and --work-tree command line regular git add works: - > git --git-dir =/tmp/test/.git --work-tree=/tmp/test add foo + > git --git-dir=/tmp/test/.git --work-tree=/tmp/test add foo > git --git-dir=/tmp/test/.git --work-tree=/tmp/test status # On branch master # From f8282b55cece7561cd04788637627e79d2f29e17 Mon Sep 17 00:00:00 2001 From: "http://christian.amsuess.com/chrysn" Date: Wed, 10 Aug 2011 16:56:51 +0000 Subject: [PATCH 4/6] problems with version 3 upgrade instructions --- doc/forum/version_3_upgrade.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/version_3_upgrade.mdwn diff --git a/doc/forum/version_3_upgrade.mdwn b/doc/forum/version_3_upgrade.mdwn new file mode 100644 index 0000000000..476b8c235f --- /dev/null +++ b/doc/forum/version_3_upgrade.mdwn @@ -0,0 +1,9 @@ +after upgrading to git-annex 3, i'm stuck with diverging git-annex branches -- i didn't manage to follow this line in the directions: + +> After this upgrade, you should make sure you include the git-annex branch when git pushing and pulling. + +could you explain how to do that in a littel more detail? git pull seems to only merge master, although i have these ``.git/config`` settings: + + [branch "git-annex"] + remote = poseidon + merge = git-annex From 8b847517a810d384a79178124b9766141b89bc17 Mon Sep 17 00:00:00 2001 From: "http://christian.amsuess.com/chrysn" Date: Wed, 10 Aug 2011 17:00:09 +0000 Subject: [PATCH 5/6] (i don't have a remote origin, but it's more common and doesn't change the example) --- doc/forum/version_3_upgrade.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/version_3_upgrade.mdwn b/doc/forum/version_3_upgrade.mdwn index 476b8c235f..7fdbcbc805 100644 --- a/doc/forum/version_3_upgrade.mdwn +++ b/doc/forum/version_3_upgrade.mdwn @@ -5,5 +5,5 @@ after upgrading to git-annex 3, i'm stuck with diverging git-annex branches -- i could you explain how to do that in a littel more detail? git pull seems to only merge master, although i have these ``.git/config`` settings: [branch "git-annex"] - remote = poseidon + remote = origin merge = git-annex From 18012c7ec8e8bcbcdc8712be29046c12adeaf6d2 Mon Sep 17 00:00:00 2001 From: "http://christian.amsuess.com/chrysn" Date: Fri, 12 Aug 2011 13:09:11 +0000 Subject: [PATCH 6/6] enhancement suggestion --- ...e_commit_messages_in_git-annex_branch.mdwn | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/bugs/wishlist:_more_descriptive_commit_messages_in_git-annex_branch.mdwn diff --git a/doc/bugs/wishlist:_more_descriptive_commit_messages_in_git-annex_branch.mdwn b/doc/bugs/wishlist:_more_descriptive_commit_messages_in_git-annex_branch.mdwn new file mode 100644 index 0000000000..68b24c2fba --- /dev/null +++ b/doc/bugs/wishlist:_more_descriptive_commit_messages_in_git-annex_branch.mdwn @@ -0,0 +1,26 @@ +as of git-annex version 3.20110719, all git-annex commits only contain the word "update" as a commit message. given that the contents of the commit are pretty non-descriptive (SHA1 hashes for file names, uuids for repository names), i suggest to have more descriptive commit messages, as shown here: + + /mnt/usb_disk/photos/2011$ git annex get + /mnt/usb_disk/photos/2011$ git show git-annex + [...] + usb-disk-photos: get 2011 + + * 10 files retrieved from 2 sources (9 from local-harddisk, 1 from my-server) + * 120 files were already present + * 2 files could not be retrieved + /mnt/usb_disk/photos/2011$ cd ~/photos/2011/07 + ~/photos/2011/07$ git copy --to my-server + ~/photos/2011/07$ git show git-annex + [...] + local-harddisk: copy 2011/07 to my-server + + * 20 files pushed + ~/photos/2011/07$ + +in my opinion, the messages should at least contain + +* what command was used +* in which repository they were executed +* which files or directories they affected (not necessarily all files, but what was given on command line or implicitly from the working directory) + +--[[chrysn]]