summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-01 18:38:07 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-01 20:24:03 (GMT)
commit67574c403f1e27660bbd0348b81b31adc9889b20 (patch)
tree5511c5cab33437edbee94e6fbe5a62d3d5827ae5 /diff.h
parent81bb573ed882523e345f0923b88db2aac8f4b93c (diff)
downloadgit-67574c403f1e27660bbd0348b81b31adc9889b20.zip
git-67574c403f1e27660bbd0348b81b31adc9889b20.tar.gz
git-67574c403f1e27660bbd0348b81b31adc9889b20.tar.bz2
[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>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 0f1ed58..3fcf701 100644
--- a/diff.h
+++ b/diff.h
@@ -4,6 +4,10 @@
#ifndef DIFF_H
#define DIFF_H
+#define DIFF_FILE_CANON_MODE(mode) \
+ (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
+ S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
+
extern void diff_addremove(int addremove,
unsigned mode,
const unsigned char *sha1,