summaryrefslogtreecommitdiff
path: root/Documentation/git-bisect.txt
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@grubix.eu>2017-08-23 14:10:45 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-23 10:35:02 -0700
commit9d89b35526b54c3ba33371b184a1ba6e30f8f46f (patch)
treec8ee29a878b32625273316edf9c84bbfce7c19cf /Documentation/git-bisect.txt
parentmerge: split write_merge_state in two (diff)
downloadtgif-9d89b35526b54c3ba33371b184a1ba6e30f8f46f.tar.xz
merge: save merge state earlier
If the `git merge` process is killed while waiting for the editor to finish, the merge state is lost but the prepared merge msg and tree is kept. So, a subsequent `git commit` creates a squashed merge even when the user asked for proper merge commit originally. Demonstrate the problem with a test crafted after the in t7502. The test requires EXECKEEPSPID (thus does not run under MINGW). Save the merge state earlier (in the non-squash case) so that it does not get lost. This makes the test pass. Reported-by: hIpPy <hippy2981@gmail.com> Signed-off-by: Michael J Gruber <git@grubix.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-bisect.txt')
0 files changed, 0 insertions, 0 deletions