refs: drop force_create argument of create_reflog API
There is only one caller, builtin/checkout.c, and it hardcodes force_create=1. This argument was introduced in abd0cd3a301 (refs: new public ref function: safe_create_reflog, 2015-07-21), which promised to immediately use it in a follow-on commit, but that never happened. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Han-Wen Nienhuys committed
Nov 22, 2021 at 14:19 UTC
7b089120d9e0065978da461f8ccf42000e6760a4
10 files changed
+16
-21
builtin/checkout.c
+1
-1
@@ -874,7 +874,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
874
int ret;
875
struct strbuf err = STRBUF_INIT;
876
877
- ret = safe_create_reflog(refname, 1, &err);
877
+ ret = safe_create_reflog(refname, &err);
878
if (ret) {
879
fprintf(stderr, _("Can not do reflog for '%s': %s\n"),
880
opts->new_orphan_branch, err.buf);
refs.c
+4
-5
@@ -2358,16 +2358,15 @@ int reflog_exists(const char *refname)
2358
}
2359
2360
int refs_create_reflog(struct ref_store *refs, const char *refname,
2361
- int force_create, struct strbuf *err)
2361
+ struct strbuf *err)
2362
{
2363
- return refs->be->create_reflog(refs, refname, force_create, err);
2363
+ return refs->be->create_reflog(refs, refname, err);
2364
}
2365
2366
-int safe_create_reflog(const char *refname, int force_create,
2367
- struct strbuf *err)
2366
+int safe_create_reflog(const char *refname, struct strbuf *err)
2367
{
2368
return refs_create_reflog(get_main_ref_store(the_repository), refname,
2370
- force_create, err);
2369
+ err);
2370
}
2371
2372
int refs_delete_reflog(struct ref_store *refs, const char *refname)
refs.h
+2
-2
@@ -413,8 +413,8 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags);
413
* Setup reflog before using. Fill in err and return -1 on failure.
414
*/
415
int refs_create_reflog(struct ref_store *refs, const char *refname,
416
- int force_create, struct strbuf *err);
417
-int safe_create_reflog(const char *refname, int force_create, struct strbuf *err);
416
+ struct strbuf *err);
417
+int safe_create_reflog(const char *refname, struct strbuf *err);
418
419
/** Reads log for the value of ref during at_time. **/
420
int read_ref_at(struct ref_store *refs,
refs/debug.c
+2
-3
@@ -339,11 +339,10 @@ static int debug_reflog_exists(struct ref_store *ref_store, const char *refname)
339
}
340
341
static int debug_create_reflog(struct ref_store *ref_store, const char *refname,
342
- int force_create, struct strbuf *err)
342
+ struct strbuf *err)
343
{
344
struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
345
- int res = drefs->refs->be->create_reflog(drefs->refs, refname,
346
- force_create, err);
345
+ int res = drefs->refs->be->create_reflog(drefs->refs, refname, err);
346
trace_printf_key(&trace_refs, "create_reflog: %s: %d\n", refname, res);
347
return res;
348
}
refs/files-backend.c
+2
-3
@@ -1639,15 +1639,14 @@ error:
1639
return -1;
1640
}
1641
1642
-static int files_create_reflog(struct ref_store *ref_store,
1643
- const char *refname, int force_create,
1642
+static int files_create_reflog(struct ref_store *ref_store, const char *refname,
1643
struct strbuf *err)
1644
{
1645
struct files_ref_store *refs =
1646
files_downcast(ref_store, REF_STORE_WRITE, "create_reflog");
1647
int fd;
1648
1650
- if (log_ref_setup(refs, refname, force_create, &fd, err))
1649
+ if (log_ref_setup(refs, refname, 1, &fd, err))
1650
return -1;
1651
1652
if (fd >= 0)
refs/packed-backend.c
+1
-2
@@ -1628,8 +1628,7 @@ static int packed_reflog_exists(struct ref_store *ref_store,
1628
}
1629
1630
static int packed_create_reflog(struct ref_store *ref_store,
1631
- const char *refname, int force_create,
1632
- struct strbuf *err)
1631
+ const char *refname, struct strbuf *err)
1632
{
1633
BUG("packed reference store does not support reflogs");
1634
}
refs/refs-internal.h
+1
-1
@@ -606,7 +606,7 @@ typedef int for_each_reflog_ent_reverse_fn(struct ref_store *ref_store,
606
void *cb_data);
607
typedef int reflog_exists_fn(struct ref_store *ref_store, const char *refname);
608
typedef int create_reflog_fn(struct ref_store *ref_store, const char *refname,
609
- int force_create, struct strbuf *err);
609
+ struct strbuf *err);
610
typedef int delete_reflog_fn(struct ref_store *ref_store, const char *refname);
611
typedef int reflog_expire_fn(struct ref_store *ref_store,
612
const char *refname,
t/helper/test-ref-store.c
+1
-2
@@ -181,11 +181,10 @@ static int cmd_reflog_exists(struct ref_store *refs, const char **argv)
181
static int cmd_create_reflog(struct ref_store *refs, const char **argv)
182
{
183
const char *refname = notnull(*argv++, "refname");
184
- int force_create = arg_flags(*argv++, "force-create");
184
struct strbuf err = STRBUF_INIT;
185
int ret;
186
188
- ret = refs_create_reflog(refs, refname, force_create, &err);
187
+ ret = refs_create_reflog(refs, refname, &err);
188
if (err.len)
189
puts(err.buf);
190
return ret;
t/t1405-main-ref-store.sh
+1
-1
@@ -108,7 +108,7 @@ test_expect_success 'delete_reflog(HEAD)' '
108
'
109
110
test_expect_success 'create-reflog(HEAD)' '
111
- $RUN create-reflog HEAD 1 &&
111
+ $RUN create-reflog HEAD &&
112
git reflog exists HEAD
113
'
114
t/t1406-submodule-ref-store.sh
+1
-1
@@ -92,7 +92,7 @@ test_expect_success 'delete_reflog() not allowed' '
92
'
93
94
test_expect_success 'create-reflog() not allowed' '
95
- test_must_fail $RUN create-reflog HEAD 1
95
+ test_must_fail $RUN create-reflog HEAD
96
'
97
98
test_done