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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/bugs/modified_permissions_persist_after_unlock__44___commit.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/bugs/modified_permissions_persist_after_unlock__44___commit.mdwn b/doc/bugs/modified_permissions_persist_after_unlock__44___commit.mdwn index 493443dd3..907ae99b4 100644 --- a/doc/bugs/modified_permissions_persist_after_unlock__44___commit.mdwn +++ b/doc/bugs/modified_permissions_persist_after_unlock__44___commit.mdwn @@ -38,3 +38,6 @@ git version 1.7.9.5 [[!tag confirmed]] [[!meta title="git commit of unlocked file leaves typechange staged in index"]] + +> [[fixed|done]]; git-annex pre-commit will block such commits from being +> made. Git devs didn't seem to have a way to improve its behavior. --[[Joey]] |