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

Re: [PATCH] git gui: use apply --unidiff-zero when staging hunks without context

From
Clemens Buchacher <drizzd@aon.at>
Date
Aug 30, 2008, 20:27 UTC
Message-ID
<20080830202706.GA13573@localhost>
In-Reply-To
<48B9A2D7.8090801@telecom.at>
On Sat, Aug 30, 2008 at 09:43:19PM +0200, Johannes Sixt wrote:
Show 5 quoted lines
> Clemens Buchacher schrieb:
>> git apply does not work correctly with zero-context patches. It does a
>> little better with --unidiff-zero.
>
> No, NO, NOOOOO! This kills your data!

Okay. Since we have 'Stage Line for Commit', supporting this would be almost pointless anyways. So let's forget about trying to fix this and simply disable zero-context diff in git-gui, as per my original patch

[PATCH] git gui: show diffs with a minimum of 1 context line
Clemens
Previous: Johannes SixtNext: Junio C Hamano
Message 8 of 17 in “git gui: show diffs with a minimum of 1 context line”
  1. git gui: show diffs with a minimum of 1 context lineClemens Buchacher, Aug 30, 2008
  2. git gui: use apply --unidiff-zero when staging hunks without contextClemens Buchacher, Aug 30, 2008
  3. Junio C HamanoAug 30, 2008
  4. git apply: do not match beginning in special unidiff-zero caseClemens Buchacher, Aug 30, 2008
  5. Junio C HamanoAug 30, 2008
  6. git-apply: Loosen "match_beginning" logicJunio C Hamano, Aug 30, 2008
  7. Johannes SixtAug 30, 2008
  8. Clemens BuchacherAug 30, 2008
  9. Junio C HamanoAug 30, 2008
  10. Clemens BuchacherAug 30, 2008
  11. Shawn O. PearceSep 1, 2008
  12. Junio C HamanoAug 30, 2008
  13. Junio C HamanoAug 30, 2008
  14. git gui: show diffs with a minimum of 1 context lineClemens Buchacher, Aug 30, 2008
  15. Shawn O. PearceSep 1, 2008
  16. Clemens BuchacherSep 1, 2008
  17. Shawn O. PearceSep 1, 2008

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.