author | Junio C Hamano <gitster@pobox.com> | |
Fri, 3 Sep 2010 16:43:44 +0000 (09:43 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 3 Sep 2010 16:43:44 +0000 (09:43 -0700) |
* cb/maint-mergetool-no-tty:
mergetool: Remove explicit references to /dev/tty
Conflicts:
git-mergetool.sh
mergetool: Remove explicit references to /dev/tty
Conflicts:
git-mergetool.sh
git-mergetool--lib.sh | patch | blob | history | |
git-mergetool.sh | patch | blob | history |
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 51dd0d67ba951873df4f26b1707a1e8a713082b9..b5e1943b1d166b543998c80579c65e82de36516a 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
while true; do
echo "$MERGED seems unchanged."
printf "Was the merge successful? [y/n] "
- read answer < /dev/tty
+ read answer
case "$answer" in
y*|Y*) status=0; break ;;
n*|N*) status=1; break ;;
diff --git a/git-mergetool.sh b/git-mergetool.sh
index bd7ab02f1161d2d97ea57b2a2ceacc307f6a74e8..2f8dc441c6d575323f2fad920ecdb7b20e1445e6 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
echo "No files need merging"
exit 0
fi
+
+ # Save original stdin
+ exec 3<&0
+
printf "Merging:\n"
printf "$files\n"
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