提交 e8d11804 编写于 作者: A Alex Riesen 提交者: Junio C Hamano

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: NDavid Aguilar <davvid@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 a6c1a382
......@@ -82,4 +82,5 @@ sub generate_command
}
setup_environment();
exec(generate_command());
my $rc = system(generate_command());
exit($rc | ($rc >> 8));
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册