From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 15F031F8C6 for ; Tue, 7 Sep 2021 13:37:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344615AbhIGNiH (ORCPT ); Tue, 7 Sep 2021 09:38:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344577AbhIGNiE (ORCPT ); Tue, 7 Sep 2021 09:38:04 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4B40C0613D9 for ; Tue, 7 Sep 2021 06:36:54 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id u15-20020a05600c19cf00b002f6445b8f55so2290362wmq.0 for ; Tue, 07 Sep 2021 06:36:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=WH2k3KghbeMFoOFf3HcPFHf0urOrSVpn5v9rkcW20KE=; b=MGABPSdULOJgRwrrE90BfTF7FM0+ylahyMx3xtT/+qtI3aRSkxvHUqVaCDY/PJRjxf Jd9wEp7bExmznm9bY1ZrSqIJsg3iC1czZXXplTLqQFtUp7u+Oh9xQoL06RJDQpED4/S9 EhodKHqrwRXPSGyBCOjg3js9xQtifq79WH4m/noW9nQ0cSneewjsERJbmab/htty415F aA6AyUmm7IJS2p4cKvwP5wj7hKR6GXNVHKhJspHzempOYS726l1dqWMIcZtSt0EdZaMF p2VgANcpM7auFA9wjxD3eIS3+pwv7HAAezwRebIc9p8ZKIuU9uX9jhdR5+xmKzCWTMkJ B0Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=WH2k3KghbeMFoOFf3HcPFHf0urOrSVpn5v9rkcW20KE=; b=Sw+hZ0ZJq/g5NhV8G90rRPlj4T1uZ8fhrZxEaJTKtpgA27lkrml7kwu3cfsiDzLjG5 O90EEDK/WIAfWj5agMvBXcgE3zV5KxFEyWfHZUSEFTjgZ1hRJ9YEkYXovWOWK7kET5jw cYiqLTHBVEaVm/g1x37Q2U4L62giy06s1Z2N49dP19o73am/1TTMotC5v3VCHWZaDkfc 0gUdCCmm53qg0NERCET57hie8Kp3quaO169cQNZfuvTBLjpNo6Ejob0TeIJ6c2/ERy6B S3gMdj6DHJoi3Vryq7Gtl76FnFCn5CbqvDVU/FLM/+H+RE5GOSmgvuliJv7wnO6UUFMB QsFQ== X-Gm-Message-State: AOAM533nd/HcaIiU9txVcG6ZWZ9SfWlalAHogtmhUMgr5684yYmH9c68 d8EL8Kw6aYwOHJqguwPhrOgC3NXsvEI= X-Google-Smtp-Source: ABdhPJz46f+/JPXWWriJK4PK/hOTgQy//IZ4a7zdL/TYJ/pYnzfNOhe5w+kY9oKIuTSdqMH9jjyyyQ== X-Received: by 2002:a7b:cbc9:: with SMTP id n9mr4103143wmi.50.1631021812854; Tue, 07 Sep 2021 06:36:52 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 17sm2309584wmj.20.2021.09.07.06.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 06:36:52 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Han-Wen Nienhuys via GitGitGadget" Date: Tue, 07 Sep 2021 13:36:46 +0000 Subject: [PATCH v3 5/7] refs: drop force_create argument of create_reflog API Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Taylor Blau , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys 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 --- builtin/checkout.c | 2 +- refs.c | 9 ++++----- refs.h | 4 ++-- refs/debug.c | 5 ++--- refs/files-backend.c | 5 ++--- refs/packed-backend.c | 3 +-- refs/refs-internal.h | 2 +- t/helper/test-ref-store.c | 3 +-- t/t1405-main-ref-store.sh | 2 +- t/t1406-submodule-ref-store.sh | 2 +- 10 files changed, 16 insertions(+), 21 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index b5d477919a7..3c6506e0595 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -876,7 +876,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts, int ret; struct strbuf err = STRBUF_INIT; - ret = safe_create_reflog(refname, 1, &err); + ret = safe_create_reflog(refname, &err); if (ret) { fprintf(stderr, _("Can not do reflog for '%s': %s\n"), opts->new_orphan_branch, err.buf); diff --git a/refs.c b/refs.c index 8b9f7c3a80a..ca59a7cc652 100644 --- a/refs.c +++ b/refs.c @@ -2347,16 +2347,15 @@ int reflog_exists(const char *refname) } int refs_create_reflog(struct ref_store *refs, const char *refname, - int force_create, struct strbuf *err) + struct strbuf *err) { - return refs->be->create_reflog(refs, refname, force_create, err); + return refs->be->create_reflog(refs, refname, err); } -int safe_create_reflog(const char *refname, int force_create, - struct strbuf *err) +int safe_create_reflog(const char *refname, struct strbuf *err) { return refs_create_reflog(get_main_ref_store(the_repository), refname, - force_create, err); + err); } int refs_delete_reflog(struct ref_store *refs, const char *refname) diff --git a/refs.h b/refs.h index 48970dfc7e0..3c457bc19c8 100644 --- a/refs.h +++ b/refs.h @@ -416,8 +416,8 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags); * Setup reflog before using. Fill in err and return -1 on failure. */ int refs_create_reflog(struct ref_store *refs, const char *refname, - int force_create, struct strbuf *err); -int safe_create_reflog(const char *refname, int force_create, struct strbuf *err); + struct strbuf *err); +int safe_create_reflog(const char *refname, struct strbuf *err); /** Reads log for the value of ref during at_time. **/ int read_ref_at(struct ref_store *refs, diff --git a/refs/debug.c b/refs/debug.c index 1a7a9e11cfa..f6b01b1eba0 100644 --- a/refs/debug.c +++ b/refs/debug.c @@ -340,11 +340,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 206c9f8b932..04d73b89c9c 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1598,15 +1598,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 f8aa97d7998..af7038de42d 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -1618,8 +1618,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 3155708345f..cc0e56e8c82 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -590,7 +590,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, const struct object_id *oid, diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c index 0fcad9b3812..a65fda66ddc 100644 --- a/t/helper/test-ref-store.c +++ b/t/helper/test-ref-store.c @@ -180,11 +180,10 @@ static int cmd_reflog_exists(struct ref_store *refs, const char **argv) static int cmd_create_reflog(struct ref_store *refs, const char **argv) { const char *refname = notnull(*argv++, "refname"); - int force_create = arg_flags(*argv++, "force-create"); struct strbuf err = STRBUF_INIT; int ret; - ret = refs_create_reflog(refs, refname, force_create, &err); + ret = refs_create_reflog(refs, refname, &err); if (err.len) puts(err.buf); return ret; diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh index 76b15458409..3cb5e23d6db 100755 --- a/t/t1405-main-ref-store.sh +++ b/t/t1405-main-ref-store.sh @@ -108,7 +108,7 @@ test_expect_success 'delete_reflog(HEAD)' ' ' test_expect_success 'create-reflog(HEAD)' ' - $RUN create-reflog HEAD 1 && + $RUN create-reflog HEAD && git reflog exists HEAD ' diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodule-ref-store.sh index b0365c1fee0..78d40bdcd8b 100755 --- a/t/t1406-submodule-ref-store.sh +++ b/t/t1406-submodule-ref-store.sh @@ -92,7 +92,7 @@ test_expect_success 'delete_reflog() not allowed' ' ' test_expect_success 'create-reflog() not allowed' ' - test_must_fail $RUN create-reflog HEAD 1 + test_must_fail $RUN create-reflog HEAD ' test_done -- gitgitgadget