diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-11 01:35:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-11 01:35:13 +0300 |
| commit | b8148376a2dbb02ade419c2e3fdc478c1f0981dd (patch) | |
| tree | 93c26104ae0f7c1052b3369263c61187745f4fb5 /refs | |
| parent | cdac0caddd21c9469ca09f9942cb0e9bc3649204 (diff) | |
| parent | 7b089120d9e0065978da461f8ccf42000e6760a4 (diff) | |
Merge branch 'hn/create-reflog-simplify'
A small simplification of API.
* hn/create-reflog-simplify:
refs: drop force_create argument of create_reflog API
Diffstat (limited to 'refs')
| -rw-r--r-- | refs/debug.c | 5 | ||||
| -rw-r--r-- | refs/files-backend.c | 5 | ||||
| -rw-r--r-- | refs/packed-backend.c | 3 | ||||
| -rw-r--r-- | refs/refs-internal.h | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/refs/debug.c b/refs/debug.c index 8667c64023..756d07c724 100644 --- a/refs/debug.c +++ b/refs/debug.c @@ -339,11 +339,10 @@ static int debug_reflog_exists(struct ref_store *ref_store, const char *refname) } static int debug_create_reflog(struct ref_store *ref_store, const char *refname, - int force_create, struct strbuf *err) + struct strbuf *err) { struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; - int res = drefs->refs->be->create_reflog(drefs->refs, refname, - force_create, err); + int res = drefs->refs->be->create_reflog(drefs->refs, refname, err); trace_printf_key(&trace_refs, "create_reflog: %s: %d\n", refname, res); return res; } diff --git a/refs/files-backend.c b/refs/files-backend.c index 4b14f30d48..237a2afb5d 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1671,15 +1671,14 @@ error: return -1; } -static int files_create_reflog(struct ref_store *ref_store, - const char *refname, int force_create, +static int files_create_reflog(struct ref_store *ref_store, const char *refname, struct strbuf *err) { struct files_ref_store *refs = files_downcast(ref_store, REF_STORE_WRITE, "create_reflog"); int fd; - if (log_ref_setup(refs, refname, force_create, &fd, err)) + if (log_ref_setup(refs, refname, 1, &fd, err)) return -1; if (fd >= 0) diff --git a/refs/packed-backend.c b/refs/packed-backend.c index 9da932a540..67152c664e 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -1629,8 +1629,7 @@ static int packed_reflog_exists(struct ref_store *ref_store, } static int packed_create_reflog(struct ref_store *ref_store, - const char *refname, int force_create, - struct strbuf *err) + const char *refname, struct strbuf *err) { BUG("packed reference store does not support reflogs"); } diff --git a/refs/refs-internal.h b/refs/refs-internal.h index fb2c58ce3b..46a839539e 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -592,7 +592,7 @@ typedef int for_each_reflog_ent_reverse_fn(struct ref_store *ref_store, void *cb_data); typedef int reflog_exists_fn(struct ref_store *ref_store, const char *refname); typedef int create_reflog_fn(struct ref_store *ref_store, const char *refname, - int force_create, struct strbuf *err); + struct strbuf *err); typedef int delete_reflog_fn(struct ref_store *ref_store, const char *refname); typedef int reflog_expire_fn(struct ref_store *ref_store, const char *refname, |