]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 66ac6e4)
merge: avoid write merge state when unable to write index
authorKyle Zhao <redacted>
Mon, 17 Jun 2024 03:08:37 +0000 (03:08 +0000)
committerJunio C Hamano <redacted>
Tue, 18 Jun 2024 15:13:35 +0000 (08:13 -0700)
commit2e5a63659301c46544fdb3c3e7a69b4693a2c384
treea95b0e5e3cb5a4b988158055b2c6b5651524dfe3tree
parent66ac6e4bcd111be3fa9c2a6b3fafea718d00678dcommit | diff
merge: avoid write merge state when unable to write index

Writing the merge state after the index write fails is meaningless and
could potentially cause Git to lose changes.

Signed-off-by: Kyle Zhao <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge.c diff | blob | history
t/t7600-merge.sh diff | blob | history
git clone https://git.99rst.org/PROJECT