diff options
| author | Harald Nordgren <haraldnordgren@gmail.com> | 2026-04-28 18:39:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-29 21:46:03 +0900 |
| commit | 26e4e50d463e1427c6288b33054e5d9a4a99a8f0 (patch) | |
| tree | 8c2c19d427f6858bda9a2fcfef880ac02e98b2b5 /t/t4013/diff.format-patch_--stdout_initial..main^ | |
| parent | e1c8b2d4ece1ada17e818b8c1b0760a47c00cae9 (diff) | |
| download | git-26e4e50d463e1427c6288b33054e5d9a4a99a8f0.tar.gz git-26e4e50d463e1427c6288b33054e5d9a4a99a8f0.zip | |
checkout: rollback lock on early returns in merge_working_tree
merge_working_tree() acquires the index lock via
repo_hold_locked_index() but several early return paths exit
without calling rollback_lock_file(), leaving the lock held.
While this is currently harmless because the process exits soon
after, it becomes a problem if the function is ever called more
than once in the same process.
Add rollback_lock_file() calls to all early return paths.
Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--stdout_initial..main^')
0 files changed, 0 insertions, 0 deletions