create_ref_entry(): remove `check_name` option
Only one caller was using it, so move the check to that caller. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
May 22, 2017 at 16:17 UTC
c1da06c6f1a77370341d93d80af027caa6a19a94
3 files changed
+10
-11
refs/files-backend.c
+8
-4
@@ -291,7 +291,7 @@ static struct packed_ref_cache *read_packed_refs(const char *packed_refs_file)
291
oidclr(&oid);
292
flag |= REF_BAD_NAME | REF_ISBROKEN;
293
}
294
- last = create_ref_entry(refname, &oid, flag, 0);
294
+ last = create_ref_entry(refname, &oid, flag);
295
if (peeled == PEELED_FULLY ||
296
(peeled == PEELED_TAGS && starts_with(refname, "refs/tags/")))
297
last->flag |= REF_KNOWS_PEELED;
@@ -415,8 +415,12 @@ static void add_packed_ref(struct files_ref_store *refs,
415
416
if (!is_lock_file_locked(&refs->packed_refs_lock))
417
die("BUG: packed refs not locked");
418
+
419
+ if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
420
+ die("Reference has invalid format: '%s'", refname);
421
+
422
add_ref_entry(get_packed_ref_dir(packed_ref_cache),
419
- create_ref_entry(refname, oid, REF_ISPACKED, 1));
423
+ create_ref_entry(refname, oid, REF_ISPACKED));
424
}
425
426
/*
@@ -493,7 +497,7 @@ static void loose_fill_ref_dir(struct ref_store *ref_store,
497
flag |= REF_BAD_NAME | REF_ISBROKEN;
498
}
499
add_entry_to_dir(dir,
496
- create_ref_entry(refname.buf, &oid, flag, 0));
500
+ create_ref_entry(refname.buf, &oid, flag));
501
}
502
strbuf_setlen(&refname, dirnamelen);
503
strbuf_setlen(&path, path_baselen);
@@ -1541,7 +1545,7 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
1545
oidcpy(&packed_entry->u.value.oid, iter->oid);
1546
} else {
1547
packed_entry = create_ref_entry(iter->refname, iter->oid,
1544
- REF_ISPACKED, 0);
1548
+ REF_ISPACKED);
1549
add_ref_entry(packed_refs, packed_entry);
1550
}
1551
oidclr(&packed_entry->u.value.peeled);
refs/ref-cache.c
+1
-5
@@ -32,14 +32,10 @@ struct ref_dir *get_ref_dir(struct ref_entry *entry)
32
}
33
34
struct ref_entry *create_ref_entry(const char *refname,
35
- const struct object_id *oid, int flag,
36
- int check_name)
35
+ const struct object_id *oid, int flag)
36
{
37
struct ref_entry *ref;
38
40
- if (check_name &&
41
- check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
42
- die("Reference has invalid format: '%s'", refname);
39
FLEX_ALLOC_STR(ref, name, refname);
40
oidcpy(&ref->u.value.oid, oid);
41
oidclr(&ref->u.value.peeled);
refs/ref-cache.h
+1
-2
@@ -185,8 +185,7 @@ struct ref_entry *create_dir_entry(struct ref_cache *cache,
185
int incomplete);
186
187
struct ref_entry *create_ref_entry(const char *refname,
188
- const struct object_id *oid, int flag,
189
- int check_name);
188
+ const struct object_id *oid, int flag);
189
190
/*
191
* Return a pointer to a new `ref_cache`. Its top-level starts out