diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-07 18:10:31 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-07 18:10:31 -0400 |
| commit | faa4935047b7083e1970d13f51fbaa6fe7d0fe3d (patch) | |
| tree | be7cbf99cc7ffe601602a669219156ba199081a3 | |
| parent | 26d3c3b4977405127b52da0cddefe845b855f08f (diff) | |
Handle a case where an annexed file is moved into a gitignored directory, by having fix --force add its change.
| -rw-r--r-- | Command/Fix.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Command/Fix.hs b/Command/Fix.hs index c46ddc7ee..b46d6e8ec 100644 --- a/Command/Fix.hs +++ b/Command/Fix.hs @@ -39,5 +39,5 @@ perform file link = do cleanup :: FilePath -> CommandCleanup cleanup file = do - Annex.Queue.add "add" [Param "--"] [file] + Annex.Queue.add "add" [Param "--force", Param "--"] [file] return True diff --git a/debian/changelog b/debian/changelog index 0b4fe3486..265a010c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git-annex (3.20111108) UNRELEASED; urgency=low + + * Handle a case where an annexed file is moved into a gitignored directory, + by having fix --force add its change. + + -- Joey Hess <joeyh@debian.org> Mon, 07 Nov 2011 18:08:42 -0400 + git-annex (3.20111107) unstable; urgency=low * merge: Use fast-forward merges when possible. diff --git a/doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn b/doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn index ca2cf7585..34d05c0b1 100644 --- a/doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn +++ b/doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn @@ -17,3 +17,5 @@ This is the error message: git-annex: user error (Command xargs ["-0","git","--git-dir=/home/[...]/repo/.git","--work-tree=/home/[...]/repo","add","--"] failed; exit code 123) failed git-annex: 1 failed + +> Weird edge case.. ok, fixed. [[done]] --[[Joey]] |