summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2014-11-20 17:20:28 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-11-21 11:27:53 -0800
commitc41d3fedd8a5dec2c2c991822b70b91c50ca047e (patch)
treecb82455a64b0d04a79c9f23e7a3e63eeb2be514f
parentmergetool--lib: remove use of $status global (diff)
downloadtgif-c41d3fedd8a5dec2c2c991822b70b91c50ca047e.tar.xz
difftool--helper: add explicit exit statement
git-difftool--helper returns a zero exit status unless --trust-exit-code is in effect. Add an explicit exit statement to make this clearer. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-difftool--helper.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index d4fb6dfe13..2b11b1d6fe 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -94,3 +94,5 @@ else
shift 7
done
fi
+
+exit 0