From: Pierre Habouzit Date: Wed, 23 Jul 2008 10:15:32 GMT Subject: [PATCH 1/2] git-checkout: fix command line parsing. Message-ID: <1216808133-31919-2-git-send-email-madcoder@debian.org> In-Reply-To: <1216808133-31919-1-git-send-email-madcoder@debian.org> This fixes an issue when you use: $ git checkout -- [...] and that can also be understood as a reference. git-checkout mistakenly understands this as the same as: $ git checkout -- [...] because parse-options was eating the '--' and the argument parser thought he was parsing: $ git checkout [...] Where there indeed is an ambiguity Signed-off-by: Pierre Habouzit --- builtin-checkout.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/builtin-checkout.c b/builtin-checkout.c index fbd5105..9cadf9c 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -438,7 +438,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) opts.track = git_branch_track; - argc = parse_options(argc, argv, options, checkout_usage, 0); + argc = parse_options(argc, argv, options, checkout_usage, + PARSE_OPT_KEEP_DASHDASH); if (argc) { arg = argv[0]; if (get_sha1(arg, rev)) -- 1.6.0.rc0.155.g8e50b