Skip to content

Commit 87cbb1c

Browse files
committed
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
2 parents 20aa6d8 + 99f86bd commit 87cbb1c

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

builtin/remote.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -693,9 +693,8 @@ static int mv(int argc, const char **argv)
693693
for (i = 0; i < remote_branches.nr; i++) {
694694
struct string_list_item *item = remote_branches.items + i;
695695
int flag = 0;
696-
struct object_id oid;
697696

698-
read_ref_full(item->string, RESOLVE_REF_READING, &oid, &flag);
697+
read_ref_full(item->string, RESOLVE_REF_READING, NULL, &flag);
699698
if (!(flag & REF_ISSYMREF))
700699
continue;
701700
if (delete_ref(NULL, item->string, NULL, REF_NO_DEREF))

refs/files-backend.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
13271327
{
13281328
struct files_ref_store *refs =
13291329
files_downcast(ref_store, REF_STORE_WRITE, "rename_ref");
1330-
struct object_id oid, orig_oid;
1330+
struct object_id orig_oid;
13311331
int flag = 0, logmoved = 0;
13321332
struct ref_lock *lock;
13331333
struct stat loginfo;
@@ -1395,7 +1395,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
13951395
*/
13961396
if (!copy && !refs_read_ref_full(&refs->base, newrefname,
13971397
RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
1398-
&oid, NULL) &&
1398+
NULL, NULL) &&
13991399
refs_delete_ref(&refs->base, NULL, newrefname,
14001400
NULL, REF_NO_DEREF)) {
14011401
if (errno == EISDIR) {

0 commit comments

Comments
 (0)