path: root/diff-tree.c
diff options
authorJunio C Hamano <>2005-06-01 18:38:07 (GMT)
committerLinus Torvalds <>2005-06-01 20:24:03 (GMT)
commit67574c403f1e27660bbd0348b81b31adc9889b20 (patch)
tree5511c5cab33437edbee94e6fbe5a62d3d5827ae5 /diff-tree.c
parent81bb573ed882523e345f0923b88db2aac8f4b93c (diff)
[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 <>
Diffstat (limited to 'diff-tree.c')
1 files changed, 3 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c
index db37aa7..a6d358f 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -44,10 +44,12 @@ static const unsigned char *extract(void *tree, unsigned long size, const char *
int len = strlen(tree)+1;
const unsigned char *sha1 = tree + len;
const char *path = strchr(tree, ' ');
+ unsigned int mode;
- if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
+ if (!path || size < len + 20 || sscanf(tree, "%o", &mode) != 1)
die("corrupt tree file");
*pathp = path+1;
+ *modep = DIFF_FILE_CANON_MODE(mode);
return sha1;