Merge branch 'jk/describe-perf' into seen

gitster · gitster · commit 4a314e7afec4 · 2024-12-06T14:31:28.000+09:00
* jk/describe-perf:
  describe: drop early return for max_candidates == 0
diff --git a/builtin/describe.c b/builtin/describe.c
@@ -338,8 +338,6 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
 		return;
 	}
 
-	if (!max_candidates)
-		die(_("no tag exactly matches '%s'"), oid_to_hex(&cmit->object.oid));
 	if (debug)
 		fprintf(stderr, _("No exact match on refs or tags, searching to describe\n"));
 
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
@@ -715,4 +715,10 @@ test_expect_success 'describe --broken --dirty with a file with changed stat' '
 	)
 '
 
+test_expect_success '--always with no refs falls back to commit hash' '
+	git rev-parse HEAD >expect &&
+	git describe --no-abbrev --always --match=no-such-tag >actual &&
+	test_cmp expect actual
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -338,8 +338,6 @@ static void describe_commit(struct object_id oid, struct strbuf dst)`
`338`	`338`	`return;`
`339`	`339`	`}`
`340`	`340`
`341`		`- if (!max_candidates)`
`342`		`- die(_("no tag exactly matches '%s'"), oid_to_hex(&cmit->object.oid));`
`343`	`341`	`if (debug)`
`344`	`342`	`fprintf(stderr, _("No exact match on refs or tags, searching to describe\n"));`
`345`	`343`
Original file line number	Diff line number	Diff line change
`@@ -715,4 +715,10 @@ test_expect_success 'describe --broken --dirty with a file with changed stat' '`
`715`	`715`	`)`
`716`	`716`	`'`
`717`	`717`
	`718`	`+test_expect_success '--always with no refs falls back to commit hash' '`
	`719`	`+ git rev-parse HEAD >expect &&`
	`720`	`+ git describe --no-abbrev --always --match=no-such-tag >actual &&`
	`721`	`+ test_cmp expect actual`
	`722`	`+'`
	`723`	`+`
`718`	`724`	`test_done`