From: Jonathan Nieder <jrnieder@gmail.com>
To: "Todd A. Jacobs" <tjacobs@si2services.com>
Cc: git@vger.kernel.org
Subject: Re: Bug report: %h for abbreviated hashes broken after 1.7.1
Date: Wed, 25 Aug 2010 01:24:03 -0500 [thread overview]
Message-ID: <20100825062403.GA15858@burratino> (raw)
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
next prev parent reply other threads:[~2010-08-25 6:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-25 2:54 Bug report: %h for abbreviated hashes broken after 1.7.1 Todd A. Jacobs
2010-08-25 4:14 ` Jonathan Nieder
2010-08-25 5:07 ` Todd A. Jacobs
2010-08-25 6:16 ` Björn Steinbrink
2010-08-25 6:24 ` Jonathan Nieder [this message]
2010-08-25 7:20 ` Todd A. Jacobs
2010-08-25 8:08 ` Marcus Comstedt
2010-08-25 17:27 ` Todd Zullinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100825062403.GA15858@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=tjacobs@si2services.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).