summaryrefslogtreecommitdiff
path: root/git-checkout-script
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-08-24 18:54:24 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-24 18:54:24 -0700
commit3857284f7b892f855edffc5b9c196a0dd74b1b7d (patch)
tree76754f705371a6a6c4d0e55fa806feb53bd0e64f /git-checkout-script
parentMerge refs/heads/master from . (diff)
parent[PATCH] Fix silly pathspec bug in git-ls-files (diff)
downloadtgif-3857284f7b892f855edffc5b9c196a0dd74b1b7d.tar.xz
Merge refs/heads/master from .
Diffstat (limited to 'git-checkout-script')
-rwxr-xr-xgit-checkout-script2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-checkout-script b/git-checkout-script
index a37740713e..9feff149ac 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