Merge branch 'maint' into ph/checkout
* maint: git-checkout: fix command line parsing.
This commit is contained in:
commit
6536034630
@ -438,7 +438,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
|||||||
|
|
||||||
opts.track = git_branch_track;
|
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) {
|
if (argc) {
|
||||||
arg = argv[0];
|
arg = argv[0];
|
||||||
if (get_sha1(arg, rev))
|
if (get_sha1(arg, rev))
|
||||||
|
Loading…
Reference in New Issue
Block a user