summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.8.5.2.txt
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@grubix.eu>2017-08-23 14:10:43 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-23 10:34:41 -0700
commit62dc42b9370b123924ba3423d51976e78d13a924 (patch)
tree910e279d1f9eb15653e265e03575694efbd6eec9 /Documentation/RelNotes/1.8.5.2.txt
parentDocumentation/git-merge: explain --continue (diff)
downloadtgif-62dc42b9370b123924ba3423d51976e78d13a924.tar.xz
merge: clarify call chain
prepare_to_commit() cannot be reached in the non-squash case: It is called by merge_trivial() and finish_automerge() only, but the calls to the latter are somewhat hard to track: If option_commit is not set, the code in cmd_merge() uses a fake conflict return code (ret=1) to avoid writing the tree, which also avoids setting automerge_was_ok (just as in the proper ret==1 case), so that finish_automerge() is not called. To ensure that no code change breaks that assumption, safe-guard prepare_to_commit() by a BUG() statement. Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Michael J Gruber <git@grubix.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.8.5.2.txt')
0 files changed, 0 insertions, 0 deletions