Fix locking of files with staged changes.

Previously, lock would skip files that had staged changes, but that is
counterintuitive, I think.
This commit is contained in:
Joey Hess 2011-05-31 14:58:06 -04:00
parent 181920fab9
commit fb259033d4
2 changed files with 2 additions and 1 deletions

View file

@ -19,7 +19,7 @@ command :: [Command]
command = [repoCommand "lock" paramPath seek "undo unlock command"]
seek :: [CommandSeek]
seek = [withFilesUnlocked start]
seek = [withFilesUnlocked start, withFilesUnlockedToBeCommitted start]
{- Undo unlock -}
start :: CommandStartBackendFile

1
debian/changelog vendored
View file

@ -4,6 +4,7 @@ git-annex (0.20110523) UNRELEASED; urgency=low
* Massively sped up `git annex lock` by avoiding use of the uber-slow
`git reset`, and only running `git checkout` once, even when many files
are being locked.
* Fix locking of files with staged changes.
-- Joey Hess <joeyh@debian.org> Sat, 28 May 2011 22:29:37 -0400