From: tony.luck@intel.com <tony.luck@intel.com>
Date: Tue, 23 Aug 2005 21:03:14 +0000 (-0700)
Subject: [PATCH] Fix git-checkout-script exit status
X-Git-Tag: v0.99.5^2~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=ab22707f0a9480b2fe47d20030a03994f8e5d0b3;p=git.git

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

diff --git a/git-checkout-script b/git-checkout-script
index a3774071..9feff149 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