diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-24 10:20:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-24 10:20:02 -0700 |
| commit | 11bd95604ab6ebc8c2edf7db4dccb33c7659890b (patch) | |
| tree | 1b5fc5153d000bbe96274db537891d4ad7c94d40 /unpack-trees.c | |
| parent | bdfc15fb21328a1461191863777583d32c034077 (diff) | |
| parent | 5c377d3d593d324346bbaa965cbff8870795b420 (diff) | |
| download | git-11bd95604ab6ebc8c2edf7db4dccb33c7659890b.tar.gz git-11bd95604ab6ebc8c2edf7db4dccb33c7659890b.tar.xz | |
Merge branch 'rs/object-id'
Conversion from uchar[20] to struct object_id continues.
* rs/object-id:
tree-walk: convert fill_tree_descriptor() to object_id
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 38000ac8f..5d5590eee 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -662,10 +662,10 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, else if (i > 1 && are_same_oid(&names[i], &names[i - 2])) t[i] = t[i - 2]; else { - const unsigned char *sha1 = NULL; + const struct object_id *oid = NULL; if (dirmask & 1) - sha1 = names[i].oid->hash; - buf[nr_buf++] = fill_tree_descriptor(t+i, sha1); + oid = names[i].oid; + buf[nr_buf++] = fill_tree_descriptor(t + i, oid); } } |