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>
Alex Riesen committed
Apr 22, 2009 at 09:27 UTC
e8d1180467da98c53663e462800f793d2341f5a1
1 file changed
+2
-1
git-difftool.perl
+2
-1
@@ -82,4 +82,5 @@ sub generate_command
82
}
83
84
setup_environment();
85
-exec(generate_command());
85
+my $rc = system(generate_command());
86
+exit($rc | ($rc >> 8));