diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-09-22 12:59:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-22 13:00:18 -0400 |
| commit | f5c11a1acc4ded0ffcf0f9e6cf7c316750d61ee7 (patch) | |
| tree | f03531a1db9953d8ea114f9d58e8961b0d893cd3 /debian | |
| parent | 8bca37646e326a8409a2aa8d0c7e9001663f6050 (diff) | |
Improve robustness of direct mode merge, avoiding a crash if the index file is missing.
I couldn't find a good way to make an *empty* index file (zero byte file
won't do), so I punted and just don't make index.lock when there's no index
yet. This means some other git process could race and write an index file
at the same time as the merge is ongoing, in theory. Only happens in new
repos though.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 17fd70a0f..5ebbfcd18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ git-annex (5.20150917) UNRELEASED; urgency=medium to use Google's NearLine storage. * Improve ~/.ssh/config modification code to not add trailing spaces to lines it cannot parse. + * Fix a crash at direct mode merge time when .git/index doesn't exist + yet. Triggered by eg, git-annex sync --no-commit in a fresh clone of + a repository. -- Joey Hess <id@joeyh.name> Wed, 16 Sep 2015 12:23:33 -0400 |