diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-03 14:08:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-03 14:08:13 -0700 |
commit | 309ca68e5a11f14491f1b5ad9b0b3384ac4df383 (patch) | |
tree | 69e5844ec0a8ad36b704817c60fd126bf1cc47e9 /worktree.h | |
parent | Merge branch 'jd/p4-jobs-in-commit' (diff) | |
parent | name-rev: include taggerdate in considering the best name (diff) | |
download | tgif-309ca68e5a11f14491f1b5ad9b0b3384ac4df383.tar.xz |
Merge branch 'js/name-rev-use-oldest-ref'
"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 'worktree.h')
0 files changed, 0 insertions, 0 deletions