summaryrefslogtreecommitdiff
path: root/Documentation/git-diff.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2016-11-11 21:24:44 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-11 12:53:21 -0800
commitfdf4f6c79b4260e98729ebeb208036765595e9ac (patch)
tree3be3bb1252c1cac9e43e6efe60130af7ceafc860 /Documentation/git-diff.txt
parentt6026: ensure that long-running script really is (diff)
downloadtgif-fdf4f6c79b4260e98729ebeb208036765595e9ac.tar.xz
t6026: clarify the point of "kill $(cat sleep.pid)"
We lengthened the time the leftover process sleeps in the previous commit to make sure it will be there while 'git merge' runs and finishes. It therefore needs to be killed before leaving the test. And it needs to be killed even when 'git merge' fails, so it has to be triggered via test_when_finished mechanism. Explain all that in a large comment, and move the use site of test_when_finished to immediately before 'git merge' invocation, where the process is spawned. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff.txt')
0 files changed, 0 insertions, 0 deletions