Skip to content

Commit e8d1180

Browse files
raalkmlgitster
authored andcommitted
Wait for git diff to finish in git difftool
In ActivetState Perl, exec does not wait for the started program. This breaks difftool tests and may cause unexpected behaviour: git difftool has returned, but the rest of code (diff and possibly the interactive program are still running in the background. Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent a6c1a38 commit e8d1180

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

git-difftool.perl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,5 @@ sub generate_command
8282
}
8383

8484
setup_environment();
85-
exec(generate_command());
85+
my $rc = system(generate_command());
86+
exit($rc | ($rc >> 8));

0 commit comments

Comments
 (0)