[bug] Graph log and orphan branches

[bug] Graph log and orphan branches

[Carlos Pita]

Hi all,

the graph output of log show orphan branches in a way that suggests
they have a parent. See for example:

http://stackoverflow.com/questions/22541261/git-log-of-all-branchs-in-only-the-current-tree

I think this is a bug in the UI.

Cheers
--
Carlos

Re: [bug] Graph log and orphan branches

[Carlos Pita]

> http://stackoverflow.com/questions/22541261/git-log-of-all-branchs-in-only-the-current-tree
>
> I think this is a bug in the UI.

Please notice this happens only for the --oneline output.

Re: [bug] Graph log and orphan branches

[Junio C Hamano]

Carlos Pita <carlosjosepita@gmail.com> writes:

> the graph output of log show orphan branches in a way that suggests
> they have a parent.

Reminds me of this ancient RFH topic

  http://thread.gmane.org/gmane.comp.version-control.git/236708/focus=239580

which unfortunately got no help...

Re: [bug] Graph log and orphan branches

[Dennis Kaarsemaker]

On wo, 2015-12-30 at 11:54 -0800, Junio C Hamano wrote:
> Carlos Pita <carlosjosepita@gmail.com> writes:
> 
> > the graph output of log show orphan branches in a way that suggests
> > they have a parent.
> 
> Reminds me of this ancient RFH topic
> 
>   http://thread.gmane.org/gmane.comp.version-control.git/236708/focus
> =239580
> 
> which unfortunately got no help...

Instead of a blank line, why not something like this to make root
commits stand out a bit?

diff --git a/revision.c b/revision.c
index 0a282f5..e69a992 100644
--- a/revision.c
+++ b/revision.c
@@ -3346,7 +3346,7 @@ char *get_revision_mark(const struct rev_info *revs, const struct commit *commit
                else
                        return ">";
        } else if (revs->graph)
-               return "*";
+               return commit->parents ? "*" : "^" ;
        else if (revs->cherry_mark)
                return "+";
        return "";

-- 
Dennis Kaarsemaker
www.kaarsemaker.net

Re: [bug] Graph log and orphan branches

[Carlos Pita]

> -               return "*";
> +               return commit->parents ? "*" : "^" ;

I like this idea.

Re: [bug] Graph log and orphan branches

[Junio C Hamano]

Dennis Kaarsemaker <dennis@kaarsemaker.net> writes:

> On wo, 2015-12-30 at 11:54 -0800, Junio C Hamano wrote:
>> Carlos Pita <carlosjosepita@gmail.com> writes:
>> 
>> > the graph output of log show orphan branches in a way that suggests
>> > they have a parent.
>> 
>> Reminds me of this ancient RFH topic
>> 
>>   http://thread.gmane.org/gmane.comp.version-control.git/236708/focus
>> =239580
>> 
>> which unfortunately got no help...
>
> Instead of a blank line, why not something like this to make root
> commits stand out a bit?
>

That approach will lose information when a root commit is at the
boundary, marked as uninteresting, or on the left/right side of
traversal (when --left-right is requested).  As these pieces of
information that will be lost with such an approach are a lot more
relevant than "have we hit the root?", especially in the majority of
repositories where there is only one root commit, I do not think it
is acceptable.