diff options
| author |  Pierre Habouzit <madcoder@debian.org> | 2008-07-23 12:15:32 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-23 12:09:47 -0700 |
| commit | f5242ebf0dcd858ae9c72f39aed9773696d7283d (patch) | |
| tree | a35c765ccd4b19437be5025bdb984254763d4829 | |
| parent | fix usage string for git grep (diff) | |
| download | tgif-f5242ebf0dcd858ae9c72f39aed9773696d7283d.tar.xz | |
git-checkout: fix command line parsing.
This fixes an issue when you use:
$ git checkout -- <path1> [<paths>...]
and that <path1> can also be understood as a reference. git-checkout
mistakenly understands this as the same as:
$ git checkout <path1> -- [<paths>...]
because parse-options was eating the '--' and the argument parser thought
he was parsing:
$ git checkout <path1> [<paths>...]
Where there indeed is an ambiguity
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-checkout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 93ea69bfaa..aec2bc6f8d 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -520,7 +520,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)) |