Skip to content

Commit 7b08912

Browse files
hanwengitster
authored andcommitted
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 abd0cd3 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent cd3e606 commit 7b08912

File tree

10 files changed

+16
-21
lines changed

10 files changed

+16
-21
lines changed

builtin/checkout.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
874874
int ret;
875875
struct strbuf err = STRBUF_INIT;
876876

877-
ret = safe_create_reflog(refname, 1, &err);
877+
ret = safe_create_reflog(refname, &err);
878878
if (ret) {
879879
fprintf(stderr, _("Can not do reflog for '%s': %s\n"),
880880
opts->new_orphan_branch, err.buf);

refs.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2358,16 +2358,15 @@ int reflog_exists(const char *refname)
23582358
}
23592359

23602360
int refs_create_reflog(struct ref_store *refs, const char *refname,
2361-
int force_create, struct strbuf *err)
2361+
struct strbuf *err)
23622362
{
2363-
return refs->be->create_reflog(refs, refname, force_create, err);
2363+
return refs->be->create_reflog(refs, refname, err);
23642364
}
23652365

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)
23682367
{
23692368
return refs_create_reflog(get_main_ref_store(the_repository), refname,
2370-
force_create, err);
2369+
err);
23712370
}
23722371

23732372
int refs_delete_reflog(struct ref_store *refs, const char *refname)

refs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,8 +413,8 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags);
413413
* Setup reflog before using. Fill in err and return -1 on failure.
414414
*/
415415
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);
418418

419419
/** Reads log for the value of ref during at_time. **/
420420
int read_ref_at(struct ref_store *refs,

refs/debug.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,10 @@ static int debug_reflog_exists(struct ref_store *ref_store, const char *refname)
339339
}
340340

341341
static int debug_create_reflog(struct ref_store *ref_store, const char *refname,
342-
int force_create, struct strbuf *err)
342+
struct strbuf *err)
343343
{
344344
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);
347346
trace_printf_key(&trace_refs, "create_reflog: %s: %d\n", refname, res);
348347
return res;
349348
}

refs/files-backend.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1639,15 +1639,14 @@ static int log_ref_setup(struct files_ref_store *refs,
16391639
return -1;
16401640
}
16411641

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,
16441643
struct strbuf *err)
16451644
{
16461645
struct files_ref_store *refs =
16471646
files_downcast(ref_store, REF_STORE_WRITE, "create_reflog");
16481647
int fd;
16491648

1650-
if (log_ref_setup(refs, refname, force_create, &fd, err))
1649+
if (log_ref_setup(refs, refname, 1, &fd, err))
16511650
return -1;
16521651

16531652
if (fd >= 0)

refs/packed-backend.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,8 +1628,7 @@ static int packed_reflog_exists(struct ref_store *ref_store,
16281628
}
16291629

16301630
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)
16331632
{
16341633
BUG("packed reference store does not support reflogs");
16351634
}

refs/refs-internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ typedef int for_each_reflog_ent_reverse_fn(struct ref_store *ref_store,
606606
void *cb_data);
607607
typedef int reflog_exists_fn(struct ref_store *ref_store, const char *refname);
608608
typedef int create_reflog_fn(struct ref_store *ref_store, const char *refname,
609-
int force_create, struct strbuf *err);
609+
struct strbuf *err);
610610
typedef int delete_reflog_fn(struct ref_store *ref_store, const char *refname);
611611
typedef int reflog_expire_fn(struct ref_store *ref_store,
612612
const char *refname,

t/helper/test-ref-store.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,10 @@ static int cmd_reflog_exists(struct ref_store *refs, const char **argv)
181181
static int cmd_create_reflog(struct ref_store *refs, const char **argv)
182182
{
183183
const char *refname = notnull(*argv++, "refname");
184-
int force_create = arg_flags(*argv++, "force-create");
185184
struct strbuf err = STRBUF_INIT;
186185
int ret;
187186

188-
ret = refs_create_reflog(refs, refname, force_create, &err);
187+
ret = refs_create_reflog(refs, refname, &err);
189188
if (err.len)
190189
puts(err.buf);
191190
return ret;

t/t1405-main-ref-store.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ test_expect_success 'delete_reflog(HEAD)' '
108108
'
109109

110110
test_expect_success 'create-reflog(HEAD)' '
111-
$RUN create-reflog HEAD 1 &&
111+
$RUN create-reflog HEAD &&
112112
git reflog exists HEAD
113113
'
114114

t/t1406-submodule-ref-store.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ test_expect_success 'delete_reflog() not allowed' '
9292
'
9393

9494
test_expect_success 'create-reflog() not allowed' '
95-
test_must_fail $RUN create-reflog HEAD 1
95+
test_must_fail $RUN create-reflog HEAD
9696
'
9797

9898
test_done

0 commit comments

Comments
 (0)