summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--git-mergetool--lib.sh2
-rwxr-xr-xgit-mergetool.sh8
2 files changed, 7 insertions, 3 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 51dd0d67ba..b5e1943b1d 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -35,7 +35,7 @@ check_unchanged () {
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 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