diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-04-22 13:39:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-22 20:07:10 (GMT) |
| commit | 755042480429fbadbb1953416d2c04c035a78e4c (patch) | |
| tree | 90aa3cfb200ad0ab0fedb76ec38a52e4136cb6ae /t/t9903-bash-prompt.sh | |
| parent | 765428699a5381f113d19974720bc91b5bfeaf1d (diff) | |
| download | git-755042480429fbadbb1953416d2c04c035a78e4c.zip git-755042480429fbadbb1953416d2c04c035a78e4c.tar.gz git-755042480429fbadbb1953416d2c04c035a78e4c.tar.bz2 | |
name-rev: include taggerdate in considering the best name
We most likely want the oldest tag that contained the commit to be
reported. So let's remember the taggerdate, and make it more important
than anything else when choosing the best name for a given commit.
Suggested by Linus Torvalds.
Note that we need to update t9903 because it tested for the old behavior
(which preferred the description "b1~1" over "tags/t2~1").
We might want to introduce a --heed-taggerdate option, and make the new
behavior dependent on that, if it turns out that some scripts rely on the
old name-rev method.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9903-bash-prompt.sh')
| -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 49d58e6..9265976 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" && ( |