commit ab22707f0a9480b2fe47d20030a03994f8e5d0b3
author tony.luck@intel.com <tony.luck@intel.com> Tue Aug 23 14:03:14 2005 -0700
committer Junio C Hamano <junkio@cox.net> Wed Aug 24 18:53:15 2005 -0700
tree ad73388133afa3ba8fedbb9b413fa9eba2ead15d
parent 9e3e2a55961b846f0b92867591ce971a744b7583

[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>

git-checkout-script

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 @@
 	fi
 	[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
 	rm -f "$GIT_DIR/MERGE_HEAD"
+else
+	exit 1
 fi