From 897643cc79cb8c05694c98a4fb0560c78952db3e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 15 Nov 2006 10:46:10 -0800 Subject: [PATCH] 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 --- git-checkout.sh | 5 +++++ 1 file changed, 5 insertions(+) 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. # -- 2.11.4.GIT