diff options
| author |  Michael J Gruber <git@grubix.eu> | 2017-08-23 14:10:44 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-23 10:34:57 -0700 |
| commit | 8e6a6bb36037da87ac98da280459269168b9f525 (patch) | |
| tree | 3ccce8bed8d1251db8c735b2edf26b1bfa6c059e /t/t4126-apply-empty.sh | |
| parent | merge: clarify call chain (diff) | |
| download | tgif-8e6a6bb36037da87ac98da280459269168b9f525.tar.xz | |
merge: split write_merge_state in two
write_merge_state() writes out the merge heads, mode, and msg. But we
may want to write out heads, mode without the msg. So, split out heads
(+mode) into a separate function write_merge_heads() that is called by
write_merge_state().
No funtional change so far, except when these non-atomic writes are
interrupted: we write heads-mode-msg now when we used to write
heads-msg-mode.
Signed-off-by: Michael J Gruber <git@grubix.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4126-apply-empty.sh')
0 files changed, 0 insertions, 0 deletions