diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-05-31 14:58:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-05-31 15:00:56 -0400 |
| commit | fb259033d44cda1e2470d5029940d7b0725b4add (patch) | |
| tree | 43fafffc35bb7da5bec0cbfc8d92ecedd8f1b574 | |
| parent | 181920fab9d352d74404d0e64e0728b6654922d9 (diff) | |
Fix locking of files with staged changes.
Previously, lock would skip files that had staged changes, but that is
counterintuitive, I think.
| -rw-r--r-- | Command/Lock.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Command/Lock.hs b/Command/Lock.hs index e21792143..e55cd9e79 100644 --- a/Command/Lock.hs +++ b/Command/Lock.hs @@ -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 diff --git a/debian/changelog b/debian/changelog index 783496614..393a6161b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |