diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:39 -0800 |
| commit | 795dd116bb655f8aa8c206ecaf415527871cb7a6 (patch) | |
| tree | 678a43749175cc91a5177fc0dace6c5a6c91a36c /tree-walk.c | |
| parent | Merge branch 'mw/symlinks' (diff) | |
| parent | tree-walk: finally switch over tree descriptors to contain a pre-parsed entry (diff) | |
| download | tgif-795dd116bb655f8aa8c206ecaf415527871cb7a6.tar.xz | |
Merge branch 'ks/tree-diff-walk'
* ks/tree-diff-walk:
tree-walk: finally switch over tree descriptors to contain a pre-parsed entry
revision: convert to using diff_tree_sha1()
line-log: convert to using diff_tree_sha1()
tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULL
tree-diff: allow diff_tree_sha1 to accept NULL sha1
Diffstat (limited to 'tree-walk.c')
| -rw-r--r-- | tree-walk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tree-walk.c b/tree-walk.c index 79dba1d0f4..4dc86c7fe5 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -37,7 +37,7 @@ static void decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned /* Initialize the descriptor entry */ desc->entry.path = path; - desc->entry.mode = mode; + desc->entry.mode = canon_mode(mode); desc->entry.sha1 = (const unsigned char *)(path + len); } |