diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-11-10 15:36:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-10 15:36:24 -0400 |
| commit | f00d0f9917cd605f27e29ab5d4cfcfc08bdcb3c2 (patch) | |
| tree | e6d77b4cf8e5059c2ce01fa17ce70f2fa7d6a990 /debian | |
| parent | bf19671a7448479811eb441cdb8a526bbe2b6625 (diff) | |
pre-commit: Block partial commit of unlocked annexed file, since that left a typechange staged in index
I had hoped that the git devs could change git's handling of partial
commits to not use a false index file, but seems not.
So, this relies on some git internals to detect that case. The test suite
has a test case added to catch it if changes to git break it.
This commit was sponsored by Paul Tagliamonte.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 3e0591b00..409d84326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git-annex (5.20141126) UNRELEASED; urgency=medium + + * pre-commit: Block partial commit of unlocked annexed file, since + that left a typechange staged in index due to some infelicity of git's + handling of partial commits. + + -- Joey Hess <joeyh@debian.org> Mon, 10 Nov 2014 15:31:55 -0400 + git-annex (5.20141125) unstable; urgency=medium * Remove fixup code for bad bare repositories created by |