2009-08-15 16:23:12 +02:00
|
|
|
$ git log --decorate=full --all
|
2017-09-28 00:51:26 +02:00
|
|
|
commit b7e0bc69303b488b47deca799a7d723971dfa6cd (refs/heads/mode)
|
|
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
|
Date: Mon Jun 26 00:06:00 2006 +0000
|
|
|
|
|
|
|
|
|
|
update mode
|
|
|
|
|
|
2011-04-11 00:48:50 +02:00
|
|
|
commit cd4e72fd96faed3f0ba949dc42967430374e2290 (refs/heads/rearrange)
|
|
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
|
Date: Mon Jun 26 00:06:00 2006 +0000
|
|
|
|
|
|
|
|
|
|
Rearranged lines in dir/sub
|
|
|
|
|
|
log: decorate HEAD with branch name under --decorate=full, too
The previous step to teach "log --decorate" to show "HEAD -> master"
instead of "HEAD, master" when showing the commit at the tip of the
'master' branch, when the 'master' branch is checked out, did not
work for "log --decorate=full".
The commands in the "log" family prepare commit decorations for all
refs upfront, and the actual string used in a decoration depends on
how load_ref_decorations() is called very early in the process. By
default, "git log --decorate" stores names with common prefixes such
as "refs/heads" stripped; "git log --decorate=full" stores the full
refnames.
When the current_pointed_by_HEAD() function has to decide if "HEAD"
points at the branch a decoration describes, however, what was
passed to load_ref_decorations() to decide to strip (or keep) such a
common prefix is long lost. This makes it impossible to reliably
tell if a decoration that stores "refs/heads/master", for example,
is the 'master' branch (under "--decorate" with prefix omitted) or
'refs/heads/master' branch (under "--decorate=full").
Keep what was passed to load_ref_decorations() in a global next to
the global variable name_decoration, and use that to decide how to
match what was read from "HEAD" and what is in a decoration.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-05-13 19:25:18 +02:00
|
|
|
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master)
|
2009-08-15 16:23:12 +02:00
|
|
|
Merge: 9a6d494 c7a2ab9
|
|
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
|
Date: Mon Jun 26 00:04:00 2006 +0000
|
|
|
|
|
|
|
|
|
|
Merge branch 'side'
|
|
|
|
|
|
|
|
|
|
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side)
|
|
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
|
Date: Mon Jun 26 00:03:00 2006 +0000
|
|
|
|
|
|
|
|
|
|
Side
|
|
|
|
|
|
|
|
|
|
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
|
|
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
|
Date: Mon Jun 26 00:02:00 2006 +0000
|
|
|
|
|
|
|
|
|
|
Third
|
|
|
|
|
|
|
|
|
|
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
|
|
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
|
Date: Mon Jun 26 00:01:00 2006 +0000
|
|
|
|
|
|
|
|
|
|
Second
|
|
|
|
|
|
|
|
|
|
This is the second commit.
|
|
|
|
|
|
|
|
|
|
commit 444ac553ac7612cc88969031b02b3767fb8a353a (refs/heads/initial)
|
|
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
|
Date: Mon Jun 26 00:00:00 2006 +0000
|
|
|
|
|
|
|
|
|
|
Initial
|
|
|
|
|
$
|