diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-03-26 16:01:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 16:59:34 (GMT) |
| commit | ee3051bd2307cdc0145aa9ed9dcacb8acfc08c40 (patch) | |
| tree | 34c83024d11dbd1de894fc8d1e92a9714b30c463 /combine-diff.c | |
| parent | f9b11147e00f066d24d9eaf9783beaa173fdd5e0 (diff) | |
| download | git-ee3051bd2307cdc0145aa9ed9dcacb8acfc08c40.zip git-ee3051bd2307cdc0145aa9ed9dcacb8acfc08c40.tar.gz git-ee3051bd2307cdc0145aa9ed9dcacb8acfc08c40.tar.bz2 | |
sha1-array: convert internal storage for struct sha1_array to object_id
Make the internal storage for struct sha1_array use an array of struct
object_id internally. Update the users of this struct which inspect its
internals.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c index 59501db..a5b86d7 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1335,7 +1335,7 @@ static struct combine_diff_path *find_paths_generic(const unsigned char *sha1, opt->output_format = stat_opt; else opt->output_format = DIFF_FORMAT_NO_OUTPUT; - diff_tree_sha1(parents->sha1[i], sha1, "", opt); + diff_tree_sha1(parents->oid[i].hash, sha1, "", opt); diffcore_std(opt); paths = intersect_paths(paths, i, num_parent); @@ -1369,7 +1369,7 @@ static struct combine_diff_path *find_paths_multitree( ALLOC_ARRAY(parents_sha1, nparent); for (i = 0; i < nparent; i++) - parents_sha1[i] = parents->sha1[i]; + parents_sha1[i] = parents->oid[i].hash; /* fake list head, so worker can assume it is non-NULL */ paths_head.next = NULL; @@ -1462,7 +1462,7 @@ void diff_tree_combined(const unsigned char *sha1, if (stat_opt) { diffopts.output_format = stat_opt; - diff_tree_sha1(parents->sha1[0], sha1, "", &diffopts); + diff_tree_sha1(parents->oid[0].hash, sha1, "", &diffopts); diffcore_std(&diffopts); if (opt->orderfile) diffcore_order(opt->orderfile); |