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

Re: Git Gui does not want to work on chunk level

From
AGAlexander Gladysh <agladysh-re5jqeeqqe8avxtiumwx3w@public.gmane.org>
Date
Sep 3, 2008, 19:23 UTC
Message-ID
<c6c947f60809031223i575ca3fdya357588610bb72e8@mail.gmail.com>
In-Reply-To
<c6c947f60808270216k2feb8f9ar765cdee1fc3910ee-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
Hi, list!
On Wed, Aug 27, 2008 at 1:16 PM, Alexander Gladysh <agladysh-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
Show 10 quoted lines
> $ git --version
> git version 1.6.0.GIT
>
> $ git gui --version
> git-gui version 0.11.GITGUI
>
> I like 'stage hunk for commit' feature in Git Gui, but often it gives
> me an error message box:
>
> fatal: git-apply: bad git-diff - inconsistent old filename on line 4

Please advise how should I formulate this question to get an answer. I understand that it is hard to say something on the subject with that little info I provide, but anyway. I'm encountering this problem on roughly every fifth commit, and it is quite annoying, since I've got used to small feature-based per-chunk commits.

Does anyone else encounter this kind of error? Any debugging advice? Perhaps I can instrument git gui with logging somewhere (dump diffs for example). (I have no experience with TCL though.)

If error appears for single file diff, it would be reproduced each time I try to stage hunk from that diff. I have one such uncommitted diff now (can't send it, sorry), please advise what can I do to debug it.

Alexander.
Next: Shawn O. Pearce
Message 1 of 15 in “Re: Git Gui does not want to work on chunk level”
  1. Alexander GladyshSep 3, 2008
  2. Shawn O. PearceSep 3, 2008
  3. Alexander GladyshSep 4, 2008
  4. Shawn O. PearceSep 4, 2008
  5. Alexander GladyshSep 4, 2008
  6. Shawn O. PearceSep 5, 2008
  7. Junio C HamanoSep 5, 2008
  8. Shawn O. PearceSep 5, 2008
  9. Johannes SixtSep 15, 2008
  10. Bert WesargNov 30, 2010
  11. Bert WesargNov 30, 2010
  12. Bert WesargDec 6, 2010
  13. Alexander GladyshSep 15, 2008
  14. Alexander GladyshSep 5, 2008
  15. Shawn O. PearceSep 15, 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.