undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-mergetool: check return value from read
This commit is contained in:
Junio C Hamano 2011-09-19 20:46:48 -07:00
commit 5ec8217eb6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-mergetool--lib.sh
View File

@ -21,7 +21,7 @@ check_unchanged () {
do do
echo "$MERGED seems unchanged." echo "$MERGED seems unchanged."
printf "Was the merge successful? [y/n] " printf "Was the merge successful? [y/n] "
read answer read answer || return 1
case "$answer" in case "$answer" in
y*|Y*) status=0; break ;; y*|Y*) status=0; break ;;
n*|N*) status=1; break ;; n*|N*) status=1; break ;;

2
git-mergetool.sh
View File

@ -72,7 +72,7 @@ describe_file () {
resolve_symlink_merge () { resolve_symlink_merge () {
while true; do while true; do
printf "Use (l)ocal or (r)emote, or (a)bort? " printf "Use (l)ocal or (r)emote, or (a)bort? "
read ans read ans || return 1
case "$ans" in case "$ans" in
[lL]*) [lL]*)
git checkout-index -f --stage=2 -- "$MERGED" git checkout-index -f --stage=2 -- "$MERGED"