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

stgit truncates binary files to zero length when applying patches

From
Karl Hasselström <kha@treskal.com>
Date
Nov 15, 2005, 14:42 UTC
Message-ID
<20051115144223.GA18111@diana.vm.bytemark.co.uk>

When applying patches and not fast-forwarding, stgit truncates the binary files to zero length:

  $ cg-init .
  defaulting to local storage area
  Committing initial tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
  Committed as 73161b6ee428ac8b1c1b16b560c40e13330693d2.
  $ stg init
  $ stg new foo
  Invoking the editor: "emacs .stgit.msg"... done (exit code: 0)
  $ cp /bin/bash .
  $ stg add bash
  $ stg refresh
  Refreshing patch "foo"... done
  $ ls -l
  total 584
  -rwxr-xr-x  1 kha vtech 593304 Nov 15 15:34 bash*
  $ stg pop
  Popping patch "foo"... done
  No patches applied
  $ stg new bar
  Invoking the editor: "emacs .stgit.msg"... done (exit code: 0)
  $ echo bar > bar.txt
  $ stg add bar.txt
  $ stg refresh
  Refreshing patch "bar"... done
  $ stg push foo
  Pushing patch "foo"... done
  Now at patch "foo"
  $ ls -l
  total 4
  -rw-r--r--  1 kha vtech 4 Nov 15 15:34 bar.txt
  -rwxr-xr-x  1 kha vtech 0 Nov 15 15:35 bash*

Without the "bar" patch, popping and then pushing "foo" works as expected.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Next: Catalin Marinas
Message 1 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.