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

Re: [PATCH] cg-log: cleanup line wrapping by using bash internals

From
Junio C Hamano <junkio@cox.net>
Date
Jun 2, 2005, 20:01 UTC
Message-ID
<7vacm834vv.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20050602144621.GB16143@diku.dk>
>>>>> "JF" == Jonas Fonseca <fonseca@diku.dk> writes:
JF> BTW, I noticed the following errors:

JF> fatal: internal error in diffcore: unmodified entry remains JF> fatal: internal error in diffcore: unmodified entry remains JF> fatal: internal error in diffcore: unmodified entry remains

JF> with both current cogito and git.

If you have acquired this fix and still see the above please let me know.

Commit 67574c403f1e27660bbd0348b81b31adc9889b20 Author Junio C Hamano <junkio@cox.net>, Wed Jun 1 11:38:07 2005 -0700 Committer Linus Torvalds <torvalds@ppc970.osdl.org>, Wed Jun 1 13:24:03 2005 -0700

[PATCH] diff: mode bits fixes

The core GIT repository has trees that record regular file mode in 0664 instead of normalized 0644 pattern. Comparing such a tree with another tree that records the same file in 0644 pattern without content changes with git-diff-tree causes it to feed otherwise unmodified pairs to the diff_change() routine, which triggers a sanity check routine and barfs. This patch fixes the problem, along with the fix to another caller that uses unnormalized mode bits to call diff_change() routine in a similar way.

Without this patch, you will see "fatal error" from diff-tree when you run git-deltafy-script on the core GIT repository itself.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Previous: Jonas Fonseca
Message 2 of 2 in “cg-log: cleanup line wrapping by using bash internals”
  1. cg-log: cleanup line wrapping by using bash internalsJonas Fonseca, Jun 2, 2005
  2. Junio C HamanoJun 2, 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.