summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-07 19:03:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-07 19:03:06 -0400
commitc25b0262ea2a7322f8d2ef8aa12db05c5e5e2d1f (patch)
tree64d07d30cc3c0a87f5ed73a6a91037a40b6fce19
parent1dad90c42c6f020a619daa365189adf8d6731ae5 (diff)
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.
-rw-r--r--Git/LsFiles.hs2
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 1 deletions
diff --git a/Git/LsFiles.hs b/Git/LsFiles.hs
index ca08fe261..82ce0edaf 100644
--- a/Git/LsFiles.hs
+++ b/Git/LsFiles.hs
@@ -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. -}
diff --git a/debian/changelog b/debian/changelog
index 2facb33a0..bf6016f76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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