git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Epler <jepler@unpythonic.net>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, git@vger.kernel.org
Subject: Re: Re: [RFC PATCH v2 0/2] git-gui: (un)stage a range of changes at once
Date: Mon, 7 Dec 2009 18:38:36 -0600	[thread overview]
Message-ID: <20091208003836.GB22330@unpythonic.net> (raw)
In-Reply-To: <20091207125435.GA43609@book.hvoigt.net>

On Mon, Dec 07, 2009 at 01:54:35PM +0100, Heiko Voigt wrote:
> Jeff could you clarify or provide an example?

If I recall correctly, the problem with the v2 patch was when the change
was like
    @@ -13,8 +13,8 @@ set appvers {@@GITGUI_VERSION@@}
     set copyright [encoding convertfrom utf-8 {
     Copyright © 2006, 2007 Shawn Pearce, et. al.

    -This program is free software; you can redistribute it and/or modify
    -it under the terms of the GNU General Public License as published by
    +blah blah
    +blah blah
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
and the 'blah blah' lines were both staged in the same operation.

When doing this, the staged change is actually
    +blah blah
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
    +blah blah

but the change that should have been staged is:
    +blah blah
    +blah blah
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

Since it requires staging multiple "+" lines in one go, this problem
doesn't exist in git-gui before my changes.

The v3 patch I posted just a few minutes ago fixes this problem.

Jeff

  reply	other threads:[~2009-12-08  0:38 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-21 21:20 [RFC PATCH v2 0/2] git-gui: (un)stage a range of changes at once Jeff Epler
2009-10-21 21:20 ` [RFC PATCH 1/2] Fix applying a line when all following lines are deletions Jeff Epler
2009-12-05 21:32   ` Shawn O. Pearce
2009-10-21 21:20 ` [RFC PATCH 2/2] Make it possible to apply a range of changes at once Jeff Epler
2009-10-26 19:39 ` [RFC PATCH v2 0/2] git-gui: (un)stage " Jeff Epler
2009-12-05 21:36   ` Shawn O. Pearce
2009-12-07 12:54     ` Heiko Voigt
2009-12-08  0:38       ` Jeff Epler [this message]
2009-12-11 18:57         ` Heiko Voigt
2009-10-29  7:34 ` Peter Baumann
2009-12-04 22:07   ` Heiko Voigt
2009-12-05 21:19     ` Shawn O. Pearce

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=20091208003836.GB22330@unpythonic.net \
    --to=jepler@unpythonic.net \
    --cc=git@vger.kernel.org \
    --cc=hvoigt@hvoigt.net \
    --cc=spearce@spearce.org \
    /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).