diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-11-15 10:46:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-15 12:01:30 -0800 |
| commit | 897643cc79cb8c05694c98a4fb0560c78952db3e (patch) | |
| tree | df3ccf2478f9fb01cf8c5acae27e4a79b3e0f0a5 | |
| parent | Seek back to current filepos when mmap()ing with NO_MMAP (diff) | |
| download | tgif-897643cc79cb8c05694c98a4fb0560c78952db3e.tar.xz | |
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>
| -rwxr-xr-x | git-checkout.sh | 5 |
1 files changed, 5 insertions, 0 deletions
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. # |