summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2012-06-18 18:18:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-06-18 22:13:16 (GMT)
commitd7236c4395a0c8742871a72d920f789b5bd4abf6 (patch)
tree19a28a50e4e05a607409603b4cab19b3e40e8e9a /builtin/reset.c
parent828ea97de486c1693d6e4f2c7347acb50235a85d (diff)
downloadgit-d7236c4395a0c8742871a72d920f789b5bd4abf6.zip
git-d7236c4395a0c8742871a72d920f789b5bd4abf6.tar.gz
git-d7236c4395a0c8742871a72d920f789b5bd4abf6.tar.bz2
sha1_name: do not trigger detailed diagnosis for file arguments
diagnose_invalid_sha1_path() is meant to be called to diagnose a misspelt <treeish>:<pathname> when <pathname> does not exist in <treeish>. However, the code may call it if <treeish>:<pathname> is invalid (which triggers another call with only_to_die == 1), but for another reason. This happens when calling e.g. git log existing-file HEAD:existing-file because existing-file is a path and not a revision, the code verifies that the arguments that follow to be paths. This leads to an incorrect message like "existing-file does not exist in HEAD", even though the path exists in HEAD. Check that the search for <pathname> in <treeish> fails before triggering the diagnosis. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
0 files changed, 0 insertions, 0 deletions