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

Re: master has some toys

From
Junio C Hamano <junkio@cox.net>
Date
Nov 18, 2005, 04:26 UTC
Message-ID
<7vbr0ir387.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<437D4F57.9070303@gmail.com>
A Large Angry SCM <gitzilla@gmail.com> writes:
Show 6 quoted lines
> Files /dev/null and b/file3 differ
> diff --git a/file4 b/file4
> index 
> edc575dec543a684da5007b43886ee32ecb381ae..adb07b7ad3fa2c63251b06d1d39cb90a85b860b4 
> 100644
> Files a/file4 and b/file4 differ

Thanks. I've seen enough. I expected diff (GNU diffutils 2.8.1 is what I have handy) output which says "Binary files a/foo and b/foo differ".

Hmph. Now I'd need to find a way to catch at least these two cases...

Previous: A Large Angry SCMNext: Junio C Hamano
Message 18 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.