{"thread":{"id":"56067","subject":"[PATCH try2] rev-parse: make --quiet really be quiet","startedAt":"2021-07-07T03:05:06Z","lastAt":"2021-07-07T03:05:06Z","messageCount":1,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"429399","messageId":"20210707030458.3134502-1-felipe.contreras@gmail.com","threadId":"56067","inReplyTo":null,"subject":"[PATCH try2] rev-parse: make --quiet really be quiet","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2021-07-07T03:04:58Z","receivedAt":"2021-07-07T03:05:06Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Currently `git rev-parse --quiet --verify @{upstream}` throws an error,\nwhen it clearly shouldn't.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n object-name.c               | 7 ++++---\n t/t1503-rev-parse-verify.sh | 2 ++\n 2 files changed, 6 insertions(+), 3 deletions(-)\n\ndiff --git a/object-name.c b/object-name.c\nindex 64202de60b..b45369baab 100644\n--- a/object-name.c\n+++ b/object-name.c\n@@ -806,10 +806,11 @@ static int get_oid_basic(struct repository *r, const char *str, int len,\n \tchar *real_ref = NULL;\n \tint refs_found = 0;\n \tint at, reflog_len, nth_prior = 0;\n+\tint quiet = !!(flags & GET_OID_QUIETLY);\n \n \tif (len == r->hash_algo->hexsz && !get_oid_hex(str, oid)) {\n \t\tif (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {\n-\t\t\trefs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, 0);\n+\t\t\trefs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, quiet);\n \t\t\tif (refs_found > 0) {\n \t\t\t\twarning(warn_msg, len, str);\n \t\t\t\tif (advice_object_name_warning)\n@@ -860,11 +861,11 @@ static int get_oid_basic(struct repository *r, const char *str, int len,\n \n \tif (!len && reflog_len)\n \t\t/* allow \"@{...}\" to mean the current branch reflog */\n-\t\trefs_found = repo_dwim_ref(r, \"HEAD\", 4, oid, &real_ref, 0);\n+\t\trefs_found = repo_dwim_ref(r, \"HEAD\", 4, oid, &real_ref, quiet);\n \telse if (reflog_len)\n \t\trefs_found = repo_dwim_log(r, str, len, oid, &real_ref);\n \telse\n-\t\trefs_found = repo_dwim_ref(r, str, len, oid, &real_ref, 0);\n+\t\trefs_found = repo_dwim_ref(r, str, len, oid, &real_ref, quiet);\n \n \tif (!refs_found)\n \t\treturn -1;\ndiff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh\nindex bf08102391..688c5abdc9 100755\n--- a/t/t1503-rev-parse-verify.sh\n+++ b/t/t1503-rev-parse-verify.sh\n@@ -83,6 +83,8 @@ test_expect_success 'fails silently when using -q' '\n \ttest_must_fail git rev-parse --quiet --verify baz HEAD 2>error &&\n \ttest_must_be_empty error &&\n \ttest_must_fail git rev-parse -q --verify $HASH2 HEAD 2>error &&\n+\ttest_must_be_empty error &&\n+\ttest_must_fail git rev-parse -q --verify @{upstream} 2>error &&\n \ttest_must_be_empty error\n '\n \n-- \n2.32.0.36.g70aac2b1aa\n\n"}]}