get_sha1: avoid repeating ourselves via ONLY_TO_DIE

When the revision code cannot parse an argument like "HEAD:foo", it will call maybe_die_on_misspelt_object_name(), which re-runs get_sha1() with an extra ONLY_TO_DIE flag. We then spend more effort to generate a better error message. Unfortunately, a side effect is that our second call may repeat the same error messages from the original get_sha1() call. You can see this with: $ git show 0017 error: short SHA1 0017 is ambiguous. error: short SHA1 0017 is ambiguous. fatal: ambiguous argument '0017': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' where the second "error:" line comes from the ONLY_TO_DIE call. To fix this, we can make ONLY_TO_DIE imply QUIETLY. This is a little odd, because the whole point of ONLY_TO_DIE is to output error messages. But what we want to do is tell the rest of the get_sha1() code (particularly get_sha1_1()) that the _regular_ messages should be quiet, but the only-to-die ones should not. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Sep 26, 2016 at 07:59 UTC 7243ffdd78d56738e568abb544eba00e8079f329
2 files changed +9
sha1_name.c
+3
@@ -1386,6 +1386,9 @@ static int get_sha1_with_context_1(const char *name,
1386 const char *cp;
1387 int only_to_die = flags & GET_SHA1_ONLY_TO_DIE;
1388
1389 + if (only_to_die)
1390 + flags |= GET_SHA1_QUIETLY;
1391 +
1392 memset(oc, 0, sizeof(*oc));
1393 oc->mode = S_IFINVALID;
1394 ret = get_sha1_1(name, namelen, sha1, flags);
t/t1512-rev-parse-disambiguation.sh
+6
@@ -291,4 +291,10 @@ test_expect_success 'ambiguous short sha1 ref' '
291 grep "refname.*${REF}.*ambiguous" err
292 '
293
294 +test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated' '
295 + test_must_fail git rev-parse 00000 2>stderr &&
296 + grep "is ambiguous" stderr >errors &&
297 + test_line_count = 1 errors
298 +'
299 +
300 test_done