diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:29 +0900 |
| commit | cf861cd7a018481e8323444d29fe9e6b73c19a06 (patch) | |
| tree | 854763ac66980d68f83300660e4a88a5c0cc2d23 /builtin/replace.c | |
| parent | 91243b019ddba5248f0fde319bc75e4e2b5602b0 (diff) | |
| parent | c77722b3ea42a87381915f1203648a5f5d86c1ff (diff) | |
| download | git-cf861cd7a018481e8323444d29fe9e6b73c19a06.tar.gz | |
Merge branch 'rs/get-tagged-oid'
Code cleanup.
* rs/get-tagged-oid:
use get_tagged_oid()
tag: factor out get_tagged_oid()
Diffstat (limited to 'builtin/replace.c')
| -rw-r--r-- | builtin/replace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index 644b21ca8d..2a4afb3b93 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -421,7 +421,7 @@ static int check_one_mergetag(struct commit *commit, if (get_oid(mergetag_data->argv[i], &oid) < 0) return error(_("not a valid object name: '%s'"), mergetag_data->argv[i]); - if (oideq(&tag->tagged->oid, &oid)) + if (oideq(get_tagged_oid(tag), &oid)) return 0; /* found */ } |