summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortony.luck@intel.com <tony.luck@intel.com>2005-08-23 21:03:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-25 01:53:15 (GMT)
commitab22707f0a9480b2fe47d20030a03994f8e5d0b3 (patch)
treead73388133afa3ba8fedbb9b413fa9eba2ead15d
parent9e3e2a55961b846f0b92867591ce971a744b7583 (diff)
downloadgit-ab22707f0a9480b2fe47d20030a03994f8e5d0b3.zip
git-ab22707f0a9480b2fe47d20030a03994f8e5d0b3.tar.gz
git-ab22707f0a9480b2fe47d20030a03994f8e5d0b3.tar.bz2
[PATCH] Fix git-checkout-script exit status
Sometimes the git-read-tree in git-checkout-script fails for me. Make sure that the failed status is passed up to caller. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-checkout-script2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-checkout-script b/git-checkout-script
index a377407..9feff14 100755
--- a/git-checkout-script
+++ b/git-checkout-script
@@ -72,4 +72,6 @@ if [ "$?" -eq 0 ]; then
fi
[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
rm -f "$GIT_DIR/MERGE_HEAD"
+else
+ exit 1
fi