diff options
author | Alex Riesen <raa.lkml@gmail.com> | 2009-04-22 09:27:22 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-22 18:39:21 -0700 |
commit | e8d1180467da98c53663e462800f793d2341f5a1 (patch) | |
tree | 27d8364577c7506729f7806157174e97c0d100d8 | |
parent | a6c1a3827c934872726bafb35f51f2ad9b9e897f (diff) | |
download | git-e8d1180467da98c53663e462800f793d2341f5a1.tar.gz git-e8d1180467da98c53663e462800f793d2341f5a1.tar.xz |
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>
-rwxr-xr-x | git-difftool.perl | 3 |
1 files changed, 2 insertions, 1 deletions
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)); |