diff options
| -rw-r--r-- | Seek.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -96,7 +96,8 @@ withFilesUnlockedToBeCommitted = withFilesUnlocked' LsFiles.typeChangedStaged withFilesUnlocked' :: ([FilePath] -> Git.Repo -> IO ([FilePath], IO Bool)) -> (FilePath -> CommandStart) -> CommandSeek withFilesUnlocked' typechanged a params = prepFiltered a unlockedfiles where - check f = liftIO (notSymlink f) <&&> isJust <$> catKeyFileHEAD f + check f = liftIO (notSymlink f) <&&> + (isJust <$> catKeyFile f <||> isJust <$> catKeyFileHEAD f) unlockedfiles = filterM check =<< seekHelper typechanged params {- Finds files that may be modified. -} diff --git a/debian/changelog b/debian/changelog index 7dacd465d..bcf55d585 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ git-annex (4.20131025) UNRELEASED; urgency=low be done without losing data. * assistant: Support repairing git remotes that are locally accessible (eg, on removable drives). + * add: Fix reversion in 4.20130827 when adding unlocked files that have + not yet been committed. -- Joey Hess <joeyh@debian.org> Sat, 26 Oct 2013 12:11:48 -0400 |