diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-06 04:11:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 04:11:21 (GMT) |
| commit | 0b646bcac96a57e345887e607e0b8c9a64ff262a (patch) | |
| tree | 4c4e0e29d1743413c7fa0e1172ccebb7cbc37191 /sequencer.c | |
| parent | cb5918aa0d50f50e83787f65c2ddc3dcb10159fe (diff) | |
| parent | b74c90fb419b002c664b0236f2941c34786b18b9 (diff) | |
| download | git-0b646bcac96a57e345887e607e0b8c9a64ff262a.zip git-0b646bcac96a57e345887e607e0b8c9a64ff262a.tar.gz git-0b646bcac96a57e345887e607e0b8c9a64ff262a.tar.bz2 | |
Merge branch 'ma/lockfile-fixes'
An earlier update made it possible to use an on-stack in-core
lockfile structure (as opposed to having to deliberately leak an
on-heap one). Many codepaths have been updated to take advantage
of this new facility.
* ma/lockfile-fixes:
read_cache: roll back lock in `update_index_if_able()`
read-cache: leave lock in right state in `write_locked_index()`
read-cache: drop explicit `CLOSE_LOCK`-flag
cache.h: document `write_locked_index()`
apply: remove `newfd` from `struct apply_state`
apply: move lockfile into `apply_state`
cache-tree: simplify locking logic
checkout-index: simplify locking logic
tempfile: fix documentation on `delete_tempfile()`
lockfile: fix documentation on `close_lock_file_gently()`
treewide: prefer lockfiles on the stack
sha1_file: do not leak `lock_file`
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index f2a10cc..46c997e 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1184,7 +1184,6 @@ static int read_and_refresh_cache(struct replay_opts *opts) refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL); if (the_index.cache_changed && index_fd >= 0) { if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) { - rollback_lock_file(&index_lock); return error(_("git %s: failed to refresh the index"), _(action_name(opts))); } |