combine-diff: convert diff_tree_combined to struct object_id
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
May 30, 2017 at 10:30 UTC
b9acf54dbd2906249abb2a406d466b47da44678e
3 files changed
+7
-7
builtin/diff.c
+1
-1
@@ -194,7 +194,7 @@ static int builtin_diff_combined(struct rev_info *revs,
194
revs->dense_combined_merges = revs->combine_merges = 1;
195
for (i = 1; i < ents; i++)
196
oid_array_append(&parents, &ent[i].item->oid);
197
- diff_tree_combined(ent[0].item->oid.hash, &parents,
197
+ diff_tree_combined(&ent[0].item->oid, &parents,
198
revs->dense_combined_merges, revs);
199
oid_array_clear(&parents);
200
return 0;
combine-diff.c
+5
-5
@@ -1384,7 +1384,7 @@ static struct combine_diff_path *find_paths_multitree(
1384
}
1385
1386
1387
-void diff_tree_combined(const unsigned char *sha1,
1387
+void diff_tree_combined(const struct object_id *oid,
1388
const struct oid_array *parents,
1389
int dense,
1390
struct rev_info *rev)
@@ -1448,11 +1448,11 @@ void diff_tree_combined(const unsigned char *sha1,
1448
* diff(sha1,parent_i) for all i to do the job, specifically
1449
* for parent0.
1450
*/
1451
- paths = find_paths_generic(sha1, parents, &diffopts);
1451
+ paths = find_paths_generic(oid->hash, parents, &diffopts);
1452
}
1453
else {
1454
int stat_opt;
1455
- paths = find_paths_multitree(sha1, parents, &diffopts);
1455
+ paths = find_paths_multitree(oid->hash, parents, &diffopts);
1456
1457
/*
1458
* show stat against the first parent even
@@ -1463,7 +1463,7 @@ void diff_tree_combined(const unsigned char *sha1,
1463
if (stat_opt) {
1464
diffopts.output_format = stat_opt;
1465
1466
- diff_tree_sha1(parents->oid[0].hash, sha1, "", &diffopts);
1466
+ diff_tree_sha1(parents->oid[0].hash, oid->hash, "", &diffopts);
1467
diffcore_std(&diffopts);
1468
if (opt->orderfile)
1469
diffcore_order(opt->orderfile);
@@ -1539,6 +1539,6 @@ void diff_tree_combined_merge(const struct commit *commit, int dense,
1539
oid_array_append(&parents, &parent->item->object.oid);
1540
parent = parent->next;
1541
}
1542
- diff_tree_combined(commit->object.oid.hash, &parents, dense, rev);
1542
+ diff_tree_combined(&commit->object.oid, &parents, dense, rev);
1543
oid_array_clear(&parents);
1544
}
diff.h
+1
-1
@@ -236,7 +236,7 @@ struct combine_diff_path {
236
extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
237
int dense, struct rev_info *);
238
239
-extern void diff_tree_combined(const unsigned char *sha1, const struct oid_array *parents, int dense, struct rev_info *rev);
239
+extern void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
240
241
extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
242