diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2013-10-18 11:25:58 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-10-18 12:57:16 -0700 |
| commit | bca39695343ecb113b30c72a3b2e0cb7e73757d8 (patch) | |
| tree | 1694059fa4ce68468a592c0072b6f6d2bb654d1c /Documentation/git-mergetool.txt | |
| parent | checkout: allow dwim for branch creation for "git checkout $branch --" (diff) | |
| download | tgif-bca39695343ecb113b30c72a3b2e0cb7e73757d8.tar.xz | |
checkout: proper error message on 'git checkout foo bar --'
The previous code was detecting the presence of "--" by looking only at
argument 1. As a result, "git checkout foo bar --" was interpreted as an
ambiguous file/revision list, and errored out with:
error: pathspec 'foo' did not match any file(s) known to git.
error: pathspec 'bar' did not match any file(s) known to git.
error: pathspec '--' did not match any file(s) known to git.
This patch fixes it by walking through the argument list to find the
"--", and now complains about the number of references given.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions