diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:30 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 09:23:48 -0700 |
commit | aab9583f7b5ea5463eb3f653a0b4ecac7539dc94 (patch) | |
tree | 8a35067c58e60715b459d7c2e44bbae71344d657 /combine-diff.c | |
parent | wt-status: convert struct wt_status_state to object_id (diff) | |
download | tgif-aab9583f7b5ea5463eb3f653a0b4ecac7539dc94.tar.xz |
Convert find_unique_abbrev* to struct object_id
Convert find_unique_abbrev and find_unique_abbrev_r to each take a
pointer to struct object_id.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c index 1ec9af1f81..cf55f03b75 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -915,11 +915,11 @@ static void show_combined_header(struct combine_diff_path *elem, "", elem->path, line_prefix, c_meta, c_reset); printf("%s%sindex ", line_prefix, c_meta); for (i = 0; i < num_parent; i++) { - abb = find_unique_abbrev(elem->parent[i].oid.hash, + abb = find_unique_abbrev(&elem->parent[i].oid, abbrev); printf("%s%s", i ? "," : "", abb); } - abb = find_unique_abbrev(elem->oid.hash, abbrev); + abb = find_unique_abbrev(&elem->oid, abbrev); printf("..%s%s\n", abb, c_reset); if (mode_differs) { |