{"thread":{"id":"43704","subject":"[PATCH] git-checkout: do not allow -f and -m at the same time.","startedAt":"2006-11-15T19:06:38Z","lastAt":"2006-11-15T19:06:38Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"296989","messageId":"7vfyckmsw1.fsf@assigned-by-dhcp.cox.net","threadId":"43704","inReplyTo":null,"subject":"[PATCH] git-checkout: do not allow -f and -m at the same time.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-11-15T19:06:38Z","receivedAt":"2006-11-15T19:06:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Instead of silently ignoring one over the other, complain on\nthis incompatible combination.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\n * Back to fixing usability issues one at a time instead of\n   throwing everything away with bathwater.\n\n git-checkout.sh |    5 +++++\n 1 files changed, 5 insertions(+), 0 deletions(-)\n\ndiff --git a/git-checkout.sh b/git-checkout.sh\nindex 119bca1..eb28b29 100755\n--- a/git-checkout.sh\n+++ b/git-checkout.sh\n@@ -77,6 +77,11 @@ while [ \"$#\" != \"0\" ]; do\n     esac\n done\n \n+case \"$force$merge\" in\n+11)\n+\tdie \"git checkout: -f and -m are incompatible\"\n+esac\n+\n # The behaviour of the command with and without explicit path\n # parameters is quite different.\n #\n-- \n1.4.4\n\n"}]}