projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0a3881d
)
git-checkout: do not allow -f and -m at the same time.
author
Junio C Hamano
<junkio@cox.net>
Wed, 15 Nov 2006 18:46:10 +0000
(10:46 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 15 Nov 2006 20:01:30 +0000
(12:01 -0800)
Instead of silently ignoring one over the other, complain on
this incompatible combination.
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-checkout.sh
patch
|
blob
|
history
diff --git
a/git-checkout.sh
b/git-checkout.sh
index 119bca1ffbfb8fb0dae404a8e7389f577aebc42c..eb28b291b6d1b7d77306bb3437b9955671e45d3a 100755
(executable)
--- 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.
#