mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Handle a case where an annexed file is moved into a gitignored directory, by having fix --force add its change.

Browse source
This commit is contained in:
Joey Hess 2011-11-07 18:10:31 -04:00
parent 26d3c3b497
commit faa4935047
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Fix.hs
View file

@ -39,5 +39,5 @@ perform file link = do
cleanup :: FilePath -> CommandCleanup cleanup :: FilePath -> CommandCleanup
cleanup file = do cleanup file = do
Annex.Queue.add "add" [Param "--"] [file] Annex.Queue.add "add" [Param "--force", Param "--"] [file]
return True return True

7
debian/changelog vendored
View file

@ -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 git-annex (3.20111107) unstable; urgency=low
* merge: Use fast-forward merges when possible. * merge: Use fast-forward merges when possible.

2
doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn
View file

@ -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) git-annex: user error (Command xargs ["-0","git","--git-dir=/home/[...]/repo/.git","--work-tree=/home/[...]/repo","add","--"] failed; exit code 123)
failed failed
git-annex: 1 failed git-annex: 1 failed
> Weird edge case.. ok, fixed. [[done]] --[[Joey]]