git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Re: [RFC PATCH v2 0/2] git-gui: (un)stage a range of changes at once

From
Jeff Epler <jepler@unpythonic.net>
Date
Dec 8, 2009, 00:38 UTC
Message-ID
<20091208003836.GB22330@unpythonic.net>
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
Previous: Heiko VoigtNext: Heiko Voigt
Message 8 of 12 in “git-gui: (un)stage a range of changes at once”
  1. 0/2 git-gui: (un)stage a range of changes at onceJeff Epler, Oct 21, 2009
  2. 1/2 Fix applying a line when all following lines are deletionsJeff Epler, Oct 21, 2009
  3. Shawn O. PearceDec 5, 2009
  4. 2/2 Make it possible to apply a range of changes at onceJeff Epler, Oct 21, 2009
  5. Jeff EplerOct 26, 2009
  6. Shawn O. PearceDec 5, 2009
  7. Heiko VoigtDec 7, 2009
  8. Jeff EplerDec 8, 2009
  9. Heiko VoigtDec 11, 2009
  10. Peter BaumannOct 29, 2009
  11. Heiko VoigtDec 4, 2009
  12. Shawn O. PearceDec 5, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.