mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 20:36:19 +02:00
Code

Merge branch 'en/name-rev-make-taggerdate-much-less-important' 

"git name-rev" heuristics update.

* en/name-rev-make-taggerdate-much-less-important:
  name-rev: fix names by dropping taggerdate workaround
This commit is contained in:
Junio C Hamano 2023-02-22 14:55:44 -08:00
parent d9d677b2d8 b2182a8730
commit 5fc6d00b65
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/name-rev.c
View File

@ -108,19 +108,11 @@ static int is_better_name(struct rev_name *name,
int name_distance = effective_distance(name->distance, name->generation);
int new_distance = effective_distance(distance, generation);
/*
* When comparing names based on tags, prefer names
* based on the older tag, even if it is farther away.
*/
/* If both are tags, we prefer the nearer one. */
if (from_tag && name->from_tag)
return (name->taggerdate > taggerdate ||
(name->taggerdate == taggerdate &&
name_distance > new_distance));
return name_distance > new_distance;
/*
* We know that at least one of them is a non-tag at this point.
* favor a tag over a non-tag.
*/
/* Favor a tag over a non-tag. */
if (name->from_tag != from_tag)
return from_tag;

6
t/t6120-describe.sh
View File

@ -657,4 +657,10 @@ test_expect_success 'setup: describe commits with disjoint bases 2' '
check_describe -C disjoint2 "B-3-gHASH" HEAD
test_expect_success 'setup misleading taggerdates' '
GIT_COMMITTER_DATE="2006-12-12 12:31" git tag -a -m "another tag" newer-tag-older-commit unique-file~1
'
check_describe newer-tag-older-commit~1 --contains unique-file~2
test_done