mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] diff: mode bits fixes

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-06-01 11:38:07 -07:00
committed by Linus Torvalds
parent 81bb573ed8
commit 67574c403f
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
diff.c
View File

@ -854,12 +854,14 @@ static void diff_resolve_rename_copy(void)
else if (memcmp(p->one->sha1, p->two->sha1, 20) ||
p->one->mode != p->two->mode)
p->status = 'M';
else
/* this is a "no-change" entry.
* should not happen anymore.
* p->status = 'X';
else {
/* This is a "no-change" entry and should not
* happen anymore, but prepare for broken callers.
*/
die("internal error in diffcore: unmodified entry remains");
error("feeding unmodified %s to diffcore",
p->one->path);
p->status = 'X';
}
}
diff_debug_queue("resolve-rename-copy done", q);
}