mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-28 04:23:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

mergetool: no longer need to save standard input

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2011-09-16 13:19:33 -07:00
parent 3e8e691abe
commit 6d9990a959
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-mergetool.sh
View File

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