diff options
author | tony.luck@intel.com <tony.luck@intel.com> | 2005-08-23 14:03:14 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-24 18:53:15 -0700 |
commit | ab22707f0a9480b2fe47d20030a03994f8e5d0b3 (patch) | |
tree | ad73388133afa3ba8fedbb9b413fa9eba2ead15d | |
parent | 9e3e2a55961b846f0b92867591ce971a744b7583 (diff) | |
download | git-ab22707f0a9480b2fe47d20030a03994f8e5d0b3.tar.gz git-ab22707f0a9480b2fe47d20030a03994f8e5d0b3.tar.xz |
[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-x | git-checkout-script | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-checkout-script b/git-checkout-script index a37740713..9feff149a 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 |