Re: [PATCH v2] Let --decorate show HEAD position
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 12, 2009, 21:05 UTC
- Message-ID
- <7vk4z0e31e.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <36861d16d0e21c662430882140893ad9a0b2fb25.1255379242.git.trast@student.ethz.ch>
Thomas Rast <trast@student.ethz.ch> writes:
Show 7 quoted lines
> 'git log --graph --oneline --decorate --all' is a useful way to get a > general overview of the repository state, similar to 'gitk --all'. > Let it indicate the position of HEAD by loading that ref too, so that > the --decorate code can see it. > > Signed-off-by: Thomas Rast <trast@student.ethz.ch> > ---
I think this makes sense.
I see HEAD is given at the front in the sample output, which I think also makes sense. Is it because it is pushed the last? If so, the same commit at the tip of branch alpha and beta are decorated with beta and then alpha, I have to wonder...?
Show 47 quoted lines
>
> I wrote:
>> Damn, this fails tests and I only just noticed while testing another
>> series. Sorry for the noise, reroll upcoming...
>
>
> log-tree.c | 1 +
> t/t4013/diff.log_--decorate=full_--all | 2 +-
> t/t4013/diff.log_--decorate_--all | 2 +-
> 3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/log-tree.c b/log-tree.c
> index 1618f3c..f7d54f2 100644
> --- a/log-tree.c
> +++ b/log-tree.c
> @@ -43,6 +43,7 @@ void load_ref_decorations(int flags)
> if (!loaded) {
> loaded = 1;
> for_each_ref(add_ref_decoration, &flags);
> + head_ref(add_ref_decoration, &flags);
> }
> }
>
> diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
> index 903d9d9..d155e0b 100644
> --- a/t/t4013/diff.log_--decorate=full_--all
> +++ b/t/t4013/diff.log_--decorate=full_--all
> @@ -1,5 +1,5 @@
> $ git log --decorate=full --all
> -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (refs/heads/master)
> +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD, refs/heads/master)
> Merge: 9a6d494 c7a2ab9
> Author: A U Thor <author@example.com>
> Date: Mon Jun 26 00:04:00 2006 +0000
> diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
> index 954210e..fd7c3e6 100644
> --- a/t/t4013/diff.log_--decorate_--all
> +++ b/t/t4013/diff.log_--decorate_--all
> @@ -1,5 +1,5 @@
> $ git log --decorate --all
> -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (master)
> +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD, master)
> Merge: 9a6d494 c7a2ab9
> Author: A U Thor <author@example.com>
> Date: Mon Jun 26 00:04:00 2006 +0000
> --
> 1.6.5.62.g4370d.dirty