git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lukas Fleischer <git@cryptocrack.de>
To: Marc Branchaud <marcnarc@xiplink.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] Fix grammar in the 1.8.3 release notes.
Date: Wed, 1 May 2013 10:24:34 +0200	[thread overview]
Message-ID: <20130501082434.GA19771@blizzard> (raw)
In-Reply-To: <517FD505.9000706@xiplink.com>

On Tue, Apr 30, 2013 at 10:28:21AM -0400, Marc Branchaud wrote:
> On 13-04-29 05:15 PM, Junio C Hamano wrote:
> > Marc Branchaud <marcnarc@xiplink.com> writes:
> > 
> >> This started out as an attempt to make the backward compatibility notes
> >> more parsable, but then I just kept going...
> > 
> > Thanks.
> > 
> >>   * "git bundle" did not like a bundle created using a commit without
> >> -   any message as its one of the prerequistes.
> >> +   any message, as it is one of the prerequistes.
> > 
> > This is actually saying a different thing.  
> > 
> > When you create a bundle, you can say "you can only unbundle this in
> > a repository that has commit X", with "git bundle create $name ^X Y
> > Z".  Such a commit X is called the bundle's prerequisite.  You can
> > have more than one prerequisite, e.g. "... ^X ^W Y Z".
> > 
> > But if you create a bundle by using a commit that does not have any
> > message as X (i.e. the bundle's prerequisite), the "git bundle" did
> > not like to read the resulting bundle output.
> > 
> > So <a commit <without any message> as its (bundle's) one of the
> > prerequisites> is what the original wanted to say.  The rewrite
> > makes it read like "For a commit, having a message is a requirement
> > to be used in a bundle", at least to me.
> 
> Thanks, I did get that wrong.
> 
> CC'ing Lukas, who wrote the relevant commit (5446e33f35).
> 
> How about:
> 
> * "git bundle" can create a bundle that has a commit without a message as
>   a prerequisite, but it could not work with such a bundle.

Looks fine to me.

Junio's version with the last part changed to "as one of its
prerequisites" sounds also good to me (in both cases, however, note the
missing "i" in "prerequisites").

A third suggestion:

    "git bundle" erroneously bailed out when parsing a valid bundle
    containing a prerequisite commit without a commit message.

> 
> 		M.

  reply	other threads:[~2013-05-01  8:24 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-27  0:22 [ANNOUNCE] Git v1.8.3-rc0 Junio C Hamano
2013-04-27  2:24 ` shawn wilson
2013-04-27  5:32   ` Michael Haggerty
2013-04-28 21:12     ` Junio C Hamano
2013-04-27  9:18 ` John Keeping
2013-04-29  3:31   ` Junio C Hamano
2013-04-29 19:15 ` [PATCH] Fix grammar in the 1.8.3 release notes Marc Branchaud
2013-04-29 21:15   ` Junio C Hamano
2013-04-29 21:16     ` Junio C Hamano
2013-04-30 14:28     ` Marc Branchaud
2013-05-01  8:24       ` Lukas Fleischer [this message]
2013-05-01 14:06         ` Marc Branchaud
2013-05-01 17:55           ` Junio C Hamano
2013-04-29 21:20   ` Junio C Hamano
2013-04-30  3:09   ` Eric Sunshine
2013-04-30 15:12   ` Phil Hord

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=20130501082434.GA19771@blizzard \
    --to=git@cryptocrack.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=marcnarc@xiplink.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).