Re: Some ASCII Art

From: Junio C Hamano <junkio@cox.net>
Date: Oct 7, 2005, 19:42 UTC
Message-ID: <7vk6gpyuyr.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <1128713749.29904.84.camel@cashmere.sps.mot.com>

Jon Loeliger <jdl@freescale.com> writes:

Show 14 quoted lines

> 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

In practice, probably 30 or so bits prefix would identify an object uniquely within a repository, so one possibility is to use the first 7 or so letters from 40-byte SHA1, after making sure 7 is enough for that particular prefix -- otherwise use more for that particular object.

The current "relative to the head" notation is descriptive and easier to see when you do not have too many branches and complex merge structure but one major drawback is that it is not stable; you add a commit then what was used to be master~5 now suddenly become master~6.