From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Branchaud Subject: Re: [PATCH] Fix grammar in the 1.8.3 release notes. Date: Wed, 01 May 2013 10:06:26 -0400 Message-ID: <51812162.3060801@xiplink.com> References: <7vvc78u8jl.fsf@alter.siamese.dyndns.org> <1367262904-9885-1-git-send-email-marcnarc@xiplink.com> <7vli81ghsf.fsf@alter.siamese.dyndns.org> <517FD505.9000706@xiplink.com> <20130501082434.GA19771@blizzard> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Junio C Hamano , git@vger.kernel.org To: Lukas Fleischer X-From: git-owner@vger.kernel.org Wed May 01 16:06:34 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UXXg2-0008Tg-64 for gcvg-git-2@plane.gmane.org; Wed, 01 May 2013 16:06:34 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756833Ab3EAOGY (ORCPT ); Wed, 1 May 2013 10:06:24 -0400 Received: from smtp130.ord.emailsrvr.com ([173.203.6.130]:33646 "EHLO smtp130.ord.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754916Ab3EAOGW (ORCPT ); Wed, 1 May 2013 10:06:22 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp17.relay.ord1a.emailsrvr.com (SMTP Server) with ESMTP id 967C2380174; Wed, 1 May 2013 10:06:21 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp17.relay.ord1a.emailsrvr.com (Authenticated sender: mbranchaud-AT-xiplink.com) with ESMTPSA id 52A40380135; Wed, 1 May 2013 10:06:21 -0400 (EDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130404 Thunderbird/17.0.5 In-Reply-To: <20130501082434.GA19771@blizzard> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On 13-05-01 04:24 AM, Lukas Fleischer wrote: > 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 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 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. I like that best. M.