From: Junio C Hamano <junkio@cox.net>
To: Jonas Fonseca <fonseca@diku.dk>
Cc: Petr Baudis <pasky@ucw.cz>, git@vger.kernel.org
Subject: Re: [PATCH] cg-log: cleanup line wrapping by using bash internals
Date: Thu, 02 Jun 2005 13:01:08 -0700 [thread overview]
Message-ID: <7vacm834vv.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20050602144621.GB16143@diku.dk> (Jonas Fonseca's message of "Thu, 2 Jun 2005 16:46:21 +0200")
>>>>> "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>
prev parent reply other threads:[~2005-06-02 19:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-02 14:46 [PATCH] cg-log: cleanup line wrapping by using bash internals Jonas Fonseca
2005-06-02 20:01 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vacm834vv.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=fonseca@diku.dk \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).