From 77e52a52dd2f77e5acc0643673169b4e1d2550f9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 11 Dec 2010 17:14:54 -0400
Subject: [PATCH] Bugfix to git annex add of an unlocked file in a subdir.
 Closes: #606579

---
 Command.hs       | 4 +++-
 debian/changelog | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Command.hs b/Command.hs
index 4ba6ea4b36..69b9dee9f9 100644
--- a/Command.hs
+++ b/Command.hs
@@ -151,7 +151,9 @@ withFilesUnlocked' typechanged a params = do
 	-- unlocked files have changed type from a symlink to a regular file
 	repo <- Annex.gitRepo
 	typechangedfiles <- liftIO $ mapM (typechanged repo) params
-	unlockedfiles <- liftIO $ filterM notSymlink $ foldl (++) [] typechangedfiles
+	unlockedfiles <- liftIO $ filterM notSymlink $
+		map (\f -> Git.workTree repo ++ "/" ++ f) $
+		foldl (++) [] typechangedfiles
 	unlockedfiles' <- filterFiles unlockedfiles
 	backendPairs a unlockedfiles'
 withKeys :: SubCmdSeekStrings
diff --git a/debian/changelog b/debian/changelog
index 323cd2e75e..6bc3c788a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ git-annex (0.12) UNRELEASED; urgency=low
 
   * Add --exclude option to exclude files from processing.
   * mwdn2man: Fix a bug in newline supression. Closes: #606578
+  * Bugfix to git annex add of an unlocked file in a subdir. Closes: #606579
 
  -- Joey Hess <joeyh@debian.org>  Wed, 08 Dec 2010 14:06:47 -0400