Bugfix: git annex add, when ran without any file or directory specified, should add files in the current directory, but not act on unlocked files elsewhere in the tree.

This commit is contained in:
Joey Hess 2013-03-07 19:03:06 -04:00
parent 2f84f3926a
commit ea672b7c77
2 changed files with 4 additions and 1 deletions

View file

@ -105,7 +105,7 @@ typeChanged' ps l repo = do
return (map (\f -> relPathDirToFile cwd $ top </> f) fs, cleanup)
where
prefix = [Params "diff --name-only --diff-filter=T -z"]
suffix = Param "--" : map File l
suffix = Param "--" : (if null l then [File "."] else map File l)
{- A item in conflict has two possible values.
- Either can be Nothing, when that side deleted the file. -}

3
debian/changelog vendored
View file

@ -30,6 +30,9 @@ git-annex (4.20130228) UNRELEASED; urgency=low
* assistant: XMPP git pull and push requests are cached and sent when
presence of a new client is detected.
* assistant: Fix syncing after XMPP pairing.
* Bugfix: git annex add, when ran without any file or directory specified,
should add files in the current directory, but not act on unlocked files
elsewhere in the tree.
-- Joey Hess <joeyh@debian.org> Wed, 27 Feb 2013 23:20:40 -0400