diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-29 22:55:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-29 23:54:13 -0800 |
| commit | 1b0c7174a17de801051402ed35ac085ebd91e88c (patch) | |
| tree | 31a806fd8bf26fe1ecf42f62c82bb68f16fbc150 /diff-files.c | |
| parent | e464f4c3119b04712ab87329f3dd4d4f21b0a8a7 (diff) | |
| download | git-1b0c7174a17de801051402ed35ac085ebd91e88c.tar.gz | |
tree/diff header cleanup.
Introduce tree-walk.[ch] and move "struct tree_desc" and
associated functions from various places.
Rename DIFF_FILE_CANON_MODE(mode) macro to canon_mode(mode) and
move it to cache.h. This macro returns the canonicalized
st_mode value in the host byte order for files, symlinks and
directories -- to be compared with a tree_desc entry.
create_ce_mode(mode) in cache.h is similar but is intended to be
used for index entries (so it does not work for directories) and
returns the value in the network byte order.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-files.c')
| -rw-r--r-- | diff-files.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-files.c b/diff-files.c index b1c05b325a..3e7f5f105b 100644 --- a/diff-files.c +++ b/diff-files.c @@ -149,7 +149,7 @@ int main(int argc, const char **argv) memcpy(combine.p.parent[stage-2].sha1, nce->sha1, 20); combine.p.parent[stage-2].mode = - DIFF_FILE_CANON_MODE(mode); + canon_mode(mode); combine.p.parent[stage-2].status = DIFF_STATUS_MODIFIED; } @@ -198,7 +198,7 @@ int main(int argc, const char **argv) continue; oldmode = ntohl(ce->ce_mode); - newmode = DIFF_FILE_CANON_MODE(st.st_mode); + newmode = canon_mode(st.st_mode); if (!trust_executable_bit && S_ISREG(newmode) && S_ISREG(oldmode) && ((newmode ^ oldmode) == 0111)) |