| commit | fdf4f6c79b4260e98729ebeb208036765595e9ac | |
| author | Johannes Sixt <j6t@kdbg.org> | |
| Fri, 11 Nov 2016 20:24:44 +0000 (11 21:24 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Nov 2016 20:53:21 +0000 (11 12:53 -0800) | ||
| tree | 3be3bb1252c1cac9e43e6efe60130af7ceafc860 | treesnapshot (tar.gz zip) |
| parent | a7d6bcc32936f3f0c4ba56b5f509648ffa85f63c | commitdiff |
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>
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>
| t/t6026-merge-attr.sh | diffblobblamehistory |