projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.12.5
[platform/upstream/git.git]
/
git-difftool--helper.sh
diff --git
a/git-difftool--helper.sh
b/git-difftool--helper.sh
index
84d6cc0
..
7bfb673
100755
(executable)
--- a/
git-difftool--helper.sh
+++ b/
git-difftool--helper.sh
@@
-86,6
+86,13
@@
else
do
launch_merge_tool "$1" "$2" "$5"
status=$?
do
launch_merge_tool "$1" "$2" "$5"
status=$?
+ if test $status -ge 126
+ then
+ # Command not found (127), not executable (126) or
+ # exited via a signal (>= 128).
+ exit $status
+ fi
+
if test "$status" != 0 &&
test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
then
if test "$status" != 0 &&
test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
then