* [PATCH] git-checkout: do not allow -f and -m at the same time.
@ 2006-11-15 19:06 Junio C Hamano
0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2006-11-15 19:06 UTC (permalink / raw)
To: git
Instead of silently ignoring one over the other, complain on
this incompatible combination.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
* Back to fixing usability issues one at a time instead of
throwing everything away with bathwater.
git-checkout.sh | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/git-checkout.sh b/git-checkout.sh
index 119bca1..eb28b29 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.
#
--
1.4.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-11-15 19:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-15 19:06 [PATCH] git-checkout: do not allow -f and -m at the same time Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox