From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Aug 2017 17:20:02 +0000 (-0700)
Subject: Merge branch 'rs/object-id'
X-Git-Tag: v2.15.0-rc0~137
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/11bd95604ab6ebc8c2edf7db4dccb33c7659890b?ds=inline;hp=-c

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
---

11bd95604ab6ebc8c2edf7db4dccb33c7659890b
diff --combined unpack-trees.c
index 38000ac8fa,233ec5eb3d..5d5590eee5
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@@ -286,7 -286,7 +286,7 @@@ static void reload_gitmodules_file(stru
  	for (i = 0; i < index->cache_nr; i++) {
  		struct cache_entry *ce = index->cache[i];
  		if (ce->ce_flags & CE_UPDATE) {
 -			int r = strcmp(ce->name, ".gitmodules");
 +			int r = strcmp(ce->name, GITMODULES_FILE);
  			if (r < 0)
  				continue;
  			else if (r == 0) {
@@@ -662,10 -662,10 +662,10 @@@ static int traverse_trees_recursive(in
  		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);
  		}
  	}