Skip to content

Commit

Permalink
mergetool: no longer need to save standard input
Browse files Browse the repository at this point in the history
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: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Sep 26, 2011
1 parent 3e8e691 commit 6d9990a
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions git-mergetool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6d9990a

Please sign in to comment.