From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 22 Apr 2009 07:27:22 +0000 (+0200)
Subject: Wait for git diff to finish in git difftool
X-Git-Tag: v1.6.3-rc2~21
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e8d1180467da98c53663e462800f793d2341f5a1;p=git.git

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>
---

diff --git a/git-difftool.perl b/git-difftool.perl
index 948ff7f6f..bd828c2a6 100755
--- 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));