@matheusbsbs / matheus-bagliano / commits / d7236c4395

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>

Matthieu Moy committed Jun 18, 2012 at 20:18 UTC d7236c4395a0c8742871a72d920f789b5bd4abf6

2 files changed +12 -1

sha1_name.c

+1 -1

@@ -1115,7 +1115,7 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1,

1115 if (new_filename)

1116 filename = new_filename;

1117 ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode);

1118 - if (only_to_die) {

1118 + if (ret && only_to_die) {

1119 diagnose_invalid_sha1_path(prefix, filename,

1120 tree_sha1, object_name);

1121 free(object_name);

t/t1506-rev-parse-diagnosis.sh

+11

@@ -171,4 +171,15 @@ test_expect_success 'relative path when startup_info is NULL' '

171 grep "BUG: startup_info struct is not initialized." error

172 '

173

174 +test_expect_success '<commit>:file correctly diagnosed after a pathname' '

175 + test_must_fail git rev-parse file.txt HEAD:file.txt 1>actual 2>error &&

176 + test_i18ngrep ! "exists on disk" error &&

177 + test_i18ngrep "unknown revision or path not in the working tree" error &&

178 + cat >expect <<-\EOF &&

179 + file.txt

180 + HEAD:file.txt

181 + EOF

182 + test_cmp expect actual

183 +'

184 +

185 test_done