X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-difftool--helper.sh;h=d4fb6dfe138fffd4d000c7d5aeb7787bea9970f4;hb=7ba46269a04de20032bd2dd614be6290cd65caab;hp=7ef36b9482ccc4111f2c888bf5ccbaa2421a5875;hpb=a28e876b9dafe3f042ae057be84613f4504822b3;p=thirdparty%2Fgit.git

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 7ef36b9482..d4fb6dfe13 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -49,7 +49,8 @@ launch_merge_tool () {
 		else
 			printf "Launch '%s' [Y/n]: " "$merge_tool"
 		fi
-		if read ans && test "$ans" = n
+		read ans || return
+		if test "$ans" = n
 		then
 			return
 		fi
@@ -84,6 +85,12 @@ else
 	while test $# -gt 6
 	do
 		launch_merge_tool "$1" "$2" "$5"
+		status=$?
+		if test "$status" != 0 &&
+			test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
+		then
+			exit $status
+		fi
 		shift 7
 	done
 fi