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>
git-mirror · Nov 15, 2006 · 897643c · 897643c
1 parent 0a3881d
commit 897643c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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.
 #