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>
This commit is contained in:
Junio C Hamano 2006-11-15 10:46:10 -08:00
parent 0a3881d4cf
commit 897643cc79

View File

@ -77,6 +77,11 @@ while [ "$#" != "0" ]; do
esac esac
done 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 # The behaviour of the command with and without explicit path
# parameters is quite different. # parameters is quite different.
# #