From cf99575d74d2a68004efa152ea9e7ac1c2866935 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 28 Mar 2011 12:09:47 -0400 Subject: [PATCH] update --- Makefile | 1 + ..._issues_with_git_when_staging__47__commiting_logs.mdwn | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e1aaf8ec37..8e16645034 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,7 @@ docs: $(mans) --no-usedirs --disable-plugin=openid --plugin=sidebar \ --underlaydir=/dev/null --disable-plugin=shortcut \ --disable-plugin=smiley \ + --plugin=comments --set comments_pagespec="*" \ --exclude='news/.*' clean: diff --git a/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn b/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn index 554cfa41e2..774ca6a16c 100644 --- a/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn +++ b/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn @@ -7,7 +7,13 @@ For now it's just a bit of extra work for me when it does occur but it does not > What do you mean when you say that git "got wedged"? It hung somehow? > > If git-annex runs concurrently with another git command that locks -> the repository its git add of log files can fail. +> the repository, its git add of log files can fail. +> +> Update: Also, of course, if you are running a "got annex get" or +> similar, and ctrl-c it after it has gotten some files, it can +> end up with unstaged or in some cases un-added log files that git-annex +> wrote -- since git-annex only stages log files in git on shutdown, and +> ctrl-c bypasses that. > --[[Joey]] >> It "got wedged" as in git doesn't let me commit anything, even though it tells me that there is stuff to be committed in the staging area.