diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:46 -0700 |
| commit | 48a81ed29795da3e4cc40d4e5ea535878e4f2d9f (patch) | |
| tree | 0bbe3588f5728fa03ae0ef69dc9111ef91479a83 /lockfile.h | |
| parent | 9715f10e4206c681313d45efa239a594a0027e60 (diff) | |
| parent | 6c003d6ffb7ebd1599e73921cab5e01d7428001d (diff) | |
| download | git-48a81ed29795da3e4cc40d4e5ea535878e4f2d9f.tar.xz | |
Merge branch 'jk/reopen-tempfile-truncate'
Fix for a long-standing bug that leaves the index file corrupt when
it shrinks during a partial commit.
* jk/reopen-tempfile-truncate:
reopen_tempfile(): truncate opened file
Diffstat (limited to 'lockfile.h')
| -rw-r--r-- | lockfile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lockfile.h b/lockfile.h index f401c979f0..35403ccc0d 100644 --- a/lockfile.h +++ b/lockfile.h @@ -263,8 +263,8 @@ static inline int close_lock_file_gently(struct lock_file *lk) * nobody else) to inspect the contents you wrote, while still * holding the lock yourself. * - * * `reopen_lock_file()` to reopen the lockfile. Make further updates - * to the contents. + * * `reopen_lock_file()` to reopen the lockfile, truncating the existing + * contents. Write out the new contents. * * * `commit_lock_file()` to make the final version permanent. */ |