Permalink
Browse files

Merge branch 'maint'

* maint:
  git-mergetool: check return value from read
  • Loading branch information...
2 parents 9b502a3 + e622f41 commit 5ec8217eb6c89974fda94808a310aa651577b25d @gitster gitster committed Sep 20, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 git-mergetool--lib.sh
  2. +1 −1 git-mergetool.sh
@@ -21,7 +21,7 @@ check_unchanged () {
do
echo "$MERGED seems unchanged."
printf "Was the merge successful? [y/n] "
- read answer
+ read answer || return 1
case "$answer" in
y*|Y*) status=0; break ;;
n*|N*) status=1; break ;;
View
@@ -72,7 +72,7 @@ describe_file () {
resolve_symlink_merge () {
while true; do
printf "Use (l)ocal or (r)emote, or (a)bort? "
- read ans
+ read ans || return 1
case "$ans" in
[lL]*)
git checkout-index -f --stage=2 -- "$MERGED"

0 comments on commit 5ec8217

Please sign in to comment.