summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorCharles Bailey <charles@hashpling.org>2010-08-20 16:25:09 +0100
committerJunio C Hamano <gitster@pobox.com>2010-08-20 14:09:04 -0700
commitaf3147147f39274bd0d47faca196f84c4e9ec68d (patch)
tree020b1f727a6786ce01dfeacf5c86e83acabc4f5d /git-mergetool.sh
parent64fdc08dac6694d1e754580e7acb82dfa4988bb9 (diff)
downloadgit-af3147147f39274bd0d47faca196f84c4e9ec68d.tar.gz
mergetool: Remove explicit references to /dev/tty
mergetool used /dev/tty to switch back to receiving input from the user via inside a block with a redirected stdin. This harms testability, so change mergetool to save its original stdin to an alternative fd in this block and restore it for those sub-commands that need the original stdin. Includes additional compatibility fix from Jonathan Nieder. Tested-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
-rwxr-xr-xgit-mergetool.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index b52a7410bc..e7fa67bd9c 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -271,6 +271,10 @@ if test $# -eq 0 ; then
echo "No files need merging"
exit 0
fi
+
+ # Save original stdin
+ exec 3<&0
+
echo Merging the files: "$files"
git ls-files -u |
sed -e 's/^[^ ]* //' |
@@ -278,10 +282,10 @@ if test $# -eq 0 ; then
while IFS= read i
do
if test $last_status -ne 0; then
- prompt_after_failed_merge < /dev/tty || exit 1
+ prompt_after_failed_merge <&3 || exit 1
fi
printf "\n"
- merge_file "$i" < /dev/tty > /dev/tty
+ merge_file "$i" <&3
last_status=$?
if test $last_status -ne 0; then
rollup_status=1