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>
git-mirror · Apr 23, 2009 · e8d1180 · e8d1180
1 parent a6c1a38
commit e8d1180
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/git-difftool.perl b/git-difftool.perl
@@ -82,4 +82,5 @@ sub generate_command
 }
 
 setup_environment();
-exec(generate_command());
+my $rc = system(generate_command());
+exit($rc | ($rc >> 8));