提交 6d9990a9 编写于 作者: J Junio C Hamano

mergetool: no longer need to save standard input

Earlier code wanted to run merge_file and prompt_after_failed_merge
both of which wanted to read from the standard input of the entire
script inside a while loop, which read from a pipe, and in order to
do so, it redirected the original standard input to another file
descriptor. We no longer need to do so after the previous change.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 3e8e691a
......@@ -362,20 +362,18 @@ if test -z "$files" ; then
exit 0
fi
# Save original stdin
exec 3<&0
printf "Merging:\n"
printf "$files\n"
IFS='
'; for i in $files
'
for i in $files
do
if test $last_status -ne 0; then
prompt_after_failed_merge <&3 || exit 1
prompt_after_failed_merge || exit 1
fi
printf "\n"
merge_file "$i" <&3
merge_file "$i"
last_status=$?
if test $last_status -ne 0; then
rollup_status=1
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册