Re: Some ASCII Art

From: Jon Loeliger <jdl@freescale.com>
Date: Oct 7, 2005, 19:35 UTC
Message-ID: <1128713749.29904.84.camel@cashmere.sps.mot.com>
In-Reply-To: <7v8xx67559.fsf@assigned-by-dhcp.cox.net>

On Thu, 2005-10-06 at 15:38, Junio C Hamano wrote:

Show 6 quoted lines

> Jon Loeliger <jdl@freescale.com> writes:
> 
> > Fundamental Git Index Operations
> > Git Index Operations
> 
> These two look almost the same.

Yeah, the first one was intended to capture the operations discussed the first four points of the "The Workflow" section of the main Git doc page.

The second is "more of same", but the one picture with every ASCII arc on it was getting confusing and crowded.

> I find the label "commit-tree" on index -> odb in the second
> picture a bit misleading.  "commit-tree" takes a tree and zero
> or more commit objects to create a new commit object, so it
> works solely inside odb.

Ah!  Of course.  Thanks!

> It is good that you mention that "read-tree -u" form updates
> working tree in the second picture.

Discovering how this related was a key insight for me. :-)

>   In the same spirit, you
> might also want to mention that "checkout-index -u" updates the
> index (i.e. matches the stat information) in the same picture.

Ooh.  Yes!  Good idea.

Show 7 quoted lines

> > Commit DAG Revision Naming
> > ==========================
> >
> > Both node B and C are a commit parents of node A.
> 
> I assume that parents are left to right in this picture, that
> is, B's first parent is D, second E, and third F.

Yeah, I even meant to add that sentence before sending the mail.

Show 8 quoted lines

> > Is there a way to name node C, E, F, H, I or J?
> 
> C = A^2
> E = B^2 = A^^2
> F = B^3 = A^^3
> H = D^2 = B^^2 = A^^^2 = A~2^2
> I = F^ = B^3^ = A^^3^
> J = F^2 = B^3^2 = A^^3^2

Ah!

> They look like line noise ;-)

Indeed. :-)

Would it be a useful option to git-show-branch that would state the commit SHA1s as well?

    % git show-branch --show-revs

    * [master] Merge paul's branch
     ! [origin] Fix drm 'debug' sysfs permissions
      ! [paul] powerpc: Fix idle.c compile warning
    ---
    +   [06a41091c93e529e6cef68ba60deeb1b9ceabc7f] Merge paul's branch
    + + [05f62a5c049845eab8dfb3aeda55c18a2d4396e3] powerpc: Fix idle.c compile warning
    + + [c16ff7e44883afc05cbf6fde0e6913bb10c66885] powerpc: Define a _sdata symbol
    + + [8dad3f9257414f151cd821bfe01f54d7f52d2507] powerpc: Merge traps.c a bit more
    + + [b3491269f5604e4265ee2f27b47a76ce1e3678b6] powerpc: Use the merged of_device.c with ARCH=powerpc

Thanks for your feedback!

jdl