From: Junio C Hamano Date: Thu, 02 Jun 2005 20:01:08 GMT Subject: Re: [PATCH] cg-log: cleanup line wrapping by using bash internals Message-ID: <7vacm834vv.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20050602144621.GB16143@diku.dk> >>>>> "JF" == Jonas Fonseca 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 , Wed Jun 1 11:38:07 2005 -0700 Committer Linus Torvalds , 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 Signed-off-by: Linus Torvalds