diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-12-25 11:22:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-25 11:22:00 -0800 |
| commit | 87cbb1ca66c8a27e834d33099b6befa7f8cd989d (patch) | |
| tree | be13bd79b3a7481db6bfa3c835f5b9c832209a8e | |
| parent | Merge branch 'rb/p4-lfs' (diff) | |
| parent | remote: pass NULL to read_ref_full() because object ID is not needed (diff) | |
| download | tgif-87cbb1ca66c8a27e834d33099b6befa7f8cd989d.tar.xz | |
Merge branch 'rs/ref-read-cleanup'
Code cleanup.
* rs/ref-read-cleanup:
remote: pass NULL to read_ref_full() because object ID is not needed
refs: pass NULL to refs_read_ref_full() because object ID is not needed
| -rw-r--r-- | builtin/remote.c | 3 | ||||
| -rw-r--r-- | refs/files-backend.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index 5591cef775..96bbe828fe 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -693,9 +693,8 @@ static int mv(int argc, const char **argv) for (i = 0; i < remote_branches.nr; i++) { struct string_list_item *item = remote_branches.items + i; int flag = 0; - struct object_id oid; - read_ref_full(item->string, RESOLVE_REF_READING, &oid, &flag); + read_ref_full(item->string, RESOLVE_REF_READING, NULL, &flag); if (!(flag & REF_ISSYMREF)) continue; if (delete_ref(NULL, item->string, NULL, REF_NO_DEREF)) diff --git a/refs/files-backend.c b/refs/files-backend.c index d60767ab73..0ea66a28b6 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1327,7 +1327,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store, { struct files_ref_store *refs = files_downcast(ref_store, REF_STORE_WRITE, "rename_ref"); - struct object_id oid, orig_oid; + struct object_id orig_oid; int flag = 0, logmoved = 0; struct ref_lock *lock; struct stat loginfo; @@ -1395,7 +1395,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store, */ if (!copy && !refs_read_ref_full(&refs->base, newrefname, RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE, - &oid, NULL) && + NULL, NULL) && refs_delete_ref(&refs->base, NULL, newrefname, NULL, REF_NO_DEREF)) { if (errno == EISDIR) { |