diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-01 11:38:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-01 13:24:03 -0700 |
| commit | 67574c403f1e27660bbd0348b81b31adc9889b20 (patch) | |
| tree | 5511c5cab33437edbee94e6fbe5a62d3d5827ae5 /diff-files.c | |
| parent | 81bb573ed882523e345f0923b88db2aac8f4b93c (diff) | |
| download | git-67574c403f1e27660bbd0348b81b31adc9889b20.tar.gz git-67574c403f1e27660bbd0348b81b31adc9889b20.tar.xz | |
[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-files.c')
| -rw-r--r-- | diff-files.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/diff-files.c b/diff-files.c index f3a79e5c0..3b05497a8 100644 --- a/diff-files.c +++ b/diff-files.c @@ -88,7 +88,7 @@ int main(int argc, const char **argv) for (i = 0; i < entries; i++) { struct stat st; - unsigned int oldmode, mode; + unsigned int oldmode; struct cache_entry *ce = active_cache[i]; int changed; @@ -116,10 +116,8 @@ int main(int argc, const char **argv) continue; oldmode = ntohl(ce->ce_mode); - mode = (S_ISLNK(st.st_mode) ? S_IFLNK : - S_IFREG | ce_permissions(st.st_mode)); - - show_modified(oldmode, mode, ce->sha1, null_sha1, + show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode), + ce->sha1, null_sha1, ce->name); } diffcore_std((1 < argc) ? argv + 1 : NULL, |