diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-01 00:08:26 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-01 00:08:26 +0300 |
| commit | 9ee8f9409cab2a52e133c63bdd0acce24f99e73f (patch) | |
| tree | ae5415974eeddde5030d4be51dcf531f354b1be1 /t | |
| parent | b051c59a00dbe1b2316d10ac95c789de2ad35d18 (diff) | |
| parent | 755042480429fbadbb1953416d2c04c035a78e4c (diff) | |
Merge branch 'js/name-rev-use-oldest-ref' into maint
"git describe --contains" often made a hard-to-justify choice of
tag to give name to a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag. It did
not help that its computation of "hop" count was further tweaked to
penalize being on a side branch of a merge. The logic has been
updated to favor using the tag with the oldest tagger date, which
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."
* js/name-rev-use-oldest-ref:
name-rev: include taggerdate in considering the best name
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9903-bash-prompt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index ffbfa0efb8..0db4469c89 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -107,7 +107,7 @@ test_expect_success 'prompt - describe detached head - contains' ' ' test_expect_success 'prompt - describe detached head - branch' ' - printf " ((b1~1))" >expected && + printf " ((tags/t2~1))" >expected && git checkout b1^ && test_when_finished "git checkout master" && ( |