diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-05-30 17:01:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-05-30 17:01:22 -0400 |
| commit | 65977a558446fd4208b04614191b68bae838b044 (patch) | |
| tree | 0ad6b92ccea3e4e228f93f906fd5bbfd2cba417e /debian | |
| parent | 96f00bafd033049ae257903f3815d296e3d335ff (diff) | |
lock: Reset unlocked file to index, rather than to branch head.
Resetting an unlocked file to the branch head failed if it had just been
added, not committed, and unlocked, since the branch didbn't have it.
The code was concerned about dropping any changes that might be staged in the
index, but I cannot see why.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 9c38d1727..6b57a5580 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ git-annex (3.20120523) UNRELEASED; urgency=low * sync: Show a nicer message if a user tries to sync to a special remote. + * lock: Reset unlocked file to index, rather than to branch head. -- Joey Hess <joeyh@debian.org> Sun, 27 May 2012 20:55:29 -0400 |