From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Sep 2011 20:19:33 +0000 (-0700)
Subject: mergetool: no longer need to save standard input
X-Git-Tag: v1.7.8-rc0~109^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6d9990a959c0168ab6dfe75236980f95ac512ce5;p=git.git

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: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 83551c70c..0a06bde84 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -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