summaryrefslogtreecommitdiff
path: root/git-checkout.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-15 10:46:10 -0800
committerJunio C Hamano <junkio@cox.net>2006-11-15 12:01:30 -0800
commit897643cc79cb8c05694c98a4fb0560c78952db3e (patch)
treedf3ccf2478f9fb01cf8c5acae27e4a79b3e0f0a5 /git-checkout.sh
parent0a3881d4cfee5c4ee3991a1b14a10333355958f1 (diff)
downloadgit-897643cc79cb8c05694c98a4fb0560c78952db3e.tar.gz
git-checkout: do not allow -f and -m at the same time.
Instead of silently ignoring one over the other, complain on this incompatible combination. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-checkout.sh')
-rwxr-xr-xgit-checkout.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index 119bca1ffb..eb28b291b6 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -77,6 +77,11 @@ while [ "$#" != "0" ]; do
esac
done
+case "$force$merge" in
+11)
+ die "git checkout: -f and -m are incompatible"
+esac
+
# The behaviour of the command with and without explicit path
# parameters is quite different.
#