Re: Bug report: %h for abbreviated hashes broken after 1.7.1

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Aug 25, 2010, 06:24 UTC
Message-ID: <20100825062403.GA15858@burratino>
In-Reply-To: <AANLkTi=+tGLfs-t6+fjRu68Mt76dJw4sbNCoO9q9+uyp@mail.gmail.com>

Hi again,

Todd A. Jacobs wrote:

> On Wed, Aug 25, 2010 at 12:14 AM, Jonathan Nieder <jrnieder@gmail.com> wrote:

>> $ git log --oneline v1.7.2.2..35039ced9296786bc0971bf5385c0d6f6ea5ea1e
>> 35039ce archive: abbreviate substituted commit ids again
>
> I'm not at all sure I understand your point.

Sorry, let me try again.

As you know, in a distributed development model, history is not linear. It is possible to have multiple lines of development by people who are not aware of each other:

   o --- o --- o --- o
  /
 o --- o --- o --- o

that are only later merged.

   o --- o --- o ----- o
  /                     \
 o --- o --- o --- o --- o

Sometimes even a single person will use history like this, for release management purposes. A change that has not yet been released will be kept on one branch while releases are cut from another branch.

The command

 $ git log --oneline v2.9..topic

lists commits that are in the history of the "topic" branch but are not part of the v2.9 release.

So my response was to indicate that there is no contradiction here: that fix has been prepared but it is not part of the v1.7.2.2 release.

Regards, Jonathan