]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb9f603 167395b)
Merge branch 'mr/rerere-crash-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Apr 2024 18:52:41 +0000 (11:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Apr 2024 18:52:41 +0000 (11:52 -0700)
commit7b66f5dd8bb553905eaa162d93f000026b241079
tree62a481ea6d1d919fe3daed4ceb02ab6abe47b8f7tree | snapshot
parentfb9f603f3c6756de772ac16ddddbcb4474dd96b8commit | diff
parent167395bb47d02a2acace0c979c6d4a3020b70c88commit | diff
Merge branch 'mr/rerere-crash-fix'

When .git/rr-cache/ rerere database gets corrupted or rerere is fed to
work on a file with conflicted hunks resolved incompletely, the rerere
machinery got confused and segfaulted, which has been corrected.

* mr/rerere-crash-fix:
  rerere: fix crashes due to unmatched opening conflict markers
rerere.c diff1 | diff2 | blob | history
t/t4200-rerere.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.