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 /combine-diff.c | |
| parent | e464f4c3119b04712ab87329f3dd4d4f21b0a8a7 (diff) | |
| download | git-1b0c7174a17de801051402ed35ac085ebd91e88c.tar.gz git-1b0c7174a17de801051402ed35ac085ebd91e88c.tar.xz | |
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 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index a23894d86..f17aab33f 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) { |