path: root/combine-diff.c
diff options
authorJunio C Hamano <>2006-03-30 06:55:43 (GMT)
committerJunio C Hamano <>2006-03-30 07:54:13 (GMT)
commit1b0c7174a17de801051402ed35ac085ebd91e88c (patch)
tree31a806fd8bf26fe1ecf42f62c82bb68f16fbc150 /combine-diff.c
parente464f4c3119b04712ab87329f3dd4d4f21b0a8a7 (diff)
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 <>
Diffstat (limited to 'combine-diff.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index a23894d..f17aab3 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -649,7 +649,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
int len = st.st_size;
int cnt = 0;
- elem->mode = DIFF_FILE_CANON_MODE(st.st_mode);
+ elem->mode = canon_mode(st.st_mode);
size = len;
result = xmalloc(len + 1);
while (cnt < len) {