diff options
| author | René Scharfe <l.s.r@web.de> | 2017-01-28 23:03:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-30 14:23:42 -0800 |
| commit | 8694769f3ce9e77994a67e3ff8973dfe01fbe37c (patch) | |
| tree | b4b3763e5bb4fd51ec2bf516f048924e4d37db72 | |
| parent | 2490574d15cab6e8d955dc4132cf9e7e83fc1172 (diff) | |
| download | git-8694769f3ce9e77994a67e3ff8973dfe01fbe37c.tar.gz git-8694769f3ce9e77994a67e3ff8973dfe01fbe37c.tar.xz | |
use oidcpy() for copying hashes between instances of struct object_id
Patch generated by Coccinelle and contrib/coccinelle/object_id.cocci.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | refs/files-backend.c | 2 | ||||
| -rw-r--r-- | wt-status.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index f9023939d..8ee2aba39 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -697,7 +697,7 @@ static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator, if (peel_entry(entry, 0)) return -1; - hashcpy(peeled->hash, entry->u.value.peeled.hash); + oidcpy(peeled, &entry->u.value.peeled); return 0; } diff --git a/wt-status.c b/wt-status.c index a715e7190..a05328dc4 100644 --- a/wt-status.c +++ b/wt-status.c @@ -628,7 +628,7 @@ static void wt_status_collect_changes_initial(struct wt_status *s) d->index_status = DIFF_STATUS_ADDED; /* Leave {mode,oid}_head zero for adds. */ d->mode_index = ce->ce_mode; - hashcpy(d->oid_index.hash, ce->oid.hash); + oidcpy(&d->oid_index, &ce->oid); } } } @@ -2096,7 +2096,7 @@ static void wt_porcelain_v2_print_unmerged_entry( if (strcmp(ce->name, it->string) || !stage) break; stages[stage - 1].mode = ce->ce_mode; - hashcpy(stages[stage - 1].oid.hash, ce->oid.hash); + oidcpy(&stages[stage - 1].oid, &ce->oid); sum |= (1 << (stage - 1)); } if (sum != d->stagemask) |