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

Re: stgit truncates binary files to zero length when applying patches

From
Junio C Hamano <junkio@cox.net>
Date
Nov 16, 2005, 18:30 UTC
Message-ID
<7vr79g8mys.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<b0943d9e0511160311k725526d8v@mail.gmail.com>
Catalin Marinas <catalin.marinas@gmail.com> writes:
> ... When pushing a patch, if
> a merge is needed (like in your case, the base of the foo patch has
> changed), StGIT first tries "git-diff-tree | git-apply" for speed
> reasons. If this fails, it falls back to a three-way merge.

I think many of the scripts rely on git-apply failing reliably for unapplicable patches. I'll do a new test script in git.git/t and if it fails on binary files, try to fix it today.

Incidentally, for the last couple of days, I was working on adding a very limited binary file diff support to "diff piped to apply" pattern, and the result has been posted as "reworked rebase" patches. It is very limited in the sense that the diff output does not attempt to be useful if the patch consumer does not have both pre- and post-image blob, but for the use of StGIT's internal patch replaying purposes that is not a concern, so you might be interested in taking a look.

Previous: Karl HasselströmNext: Junio C Hamano
Message 6 of 35 in “stgit truncates binary files to zero length when applying patches”
  1. Karl HasselströmNov 15, 2005
  2. Catalin MarinasNov 16, 2005
  3. Karl HasselströmNov 16, 2005
  4. Catalin MarinasNov 16, 2005
  5. Karl HasselströmNov 16, 2005
  6. Junio C HamanoNov 16, 2005
  7. git-apply: fail if a patch cannot be applied.Junio C Hamano, Nov 16, 2005
  8. master has some toysJunio C Hamano, Nov 17, 2005
  9. Alex RiesenNov 17, 2005
  10. Junio C HamanoNov 17, 2005
  11. Alex RiesenNov 17, 2005
  12. Junio C HamanoNov 17, 2005
  13. John BenesNov 18, 2005
  14. Johannes SchindelinNov 18, 2005
  15. John BenesNov 18, 2005
  16. Junio C HamanoNov 18, 2005
  17. A Large Angry SCMNov 18, 2005
  18. Junio C HamanoNov 18, 2005
  19. Deal with binary diff output from (unknown version of) diffJunio C Hamano, Nov 18, 2005
  20. A Large Angry SCMNov 18, 2005
  21. John BenesNov 18, 2005
  22. Junio C HamanoNov 18, 2005
  23. John BenesNov 18, 2005
  24. A Large Angry SCMNov 18, 2005
  25. Johannes SchindelinNov 17, 2005
  26. Johannes SchindelinNov 17, 2005
  27. Junio C HamanoNov 17, 2005
  28. Alex RiesenNov 17, 2005
  29. Johannes SchindelinNov 17, 2005
  30. Alex RiesenNov 17, 2005
  31. Junio C HamanoNov 17, 2005
  32. Johannes SchindelinNov 17, 2005
  33. Junio C HamanoNov 18, 2005
  34. timo@dspsrv.comNov 18, 2005
  35. Alex RiesenNov 17, 2005

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.