From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Derrick Stolee <derrickstolee@github.com>
Subject: Re: [PATCH 2/2] branch: drop unused worktrees variable
Date: Tue, 21 Jun 2022 08:56:35 -0700 [thread overview]
Message-ID: <xmqqzgi6hux8.fsf@gitster.g> (raw)
In-Reply-To: <Yq6eJFUPPTv/zc0o@coredump.intra.peff.net> (Jeff King's message of "Sat, 18 Jun 2022 23:55:16 -0400")
Jeff King <peff@peff.net> writes:
> After b489b9d9aa (branch: use branch_checked_out() when deleting refs,
> 2022-06-14), we no longer look at our local "worktrees" variable, since
> branch_checked_out() handles it under the hood. The compiler didn't
> notice the unused variable because we call functions to initialize and
> free it (so it's not totally unused, it just doesn't do anything
> useful).
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> It would be neat if there was some way to mark a function as "this is
> just allocating a structure, with no useful side effects" and another as
> "this is just freeing", which would let the compiler notice that we
> don't do anything useful with the structure in between the two. I have a
> feeling adding such annotations might be more work than occasionally
> finding and cleaning up such useless variables, though. :)
Also it may be tricky to write correctly ;-)
I recently got rid of a Coccinelle rule I wrote quite a while ago
that was suggesting a completely bogus rewrite, and found it quite
satisfying. After that experience, I got allergic to the idea of
having to make sure a mechanical rewrite suggested by the tool if it
gets too large X-<.
For this particular pattern, presumably we won't have too many of
them, though.
Thanks.
> builtin/branch.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index f875952e7b..55cd9a6e99 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -204,7 +204,6 @@ static void delete_branch_config(const char *branchname)
> static int delete_branches(int argc, const char **argv, int force, int kinds,
> int quiet)
> {
> - struct worktree **worktrees;
> struct commit *head_rev = NULL;
> struct object_id oid;
> char *name = NULL;
> @@ -242,8 +241,6 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
> die(_("Couldn't look up commit object for HEAD"));
> }
>
> - worktrees = get_worktrees();
> -
> for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
> char *target = NULL;
> int flags = 0;
> @@ -314,7 +311,6 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
>
> free(name);
> strbuf_release(&bname);
> - free_worktrees(worktrees);
>
> return ret;
> }
next prev parent reply other threads:[~2022-06-21 16:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-19 3:52 [PATCH 0/2] extra cleanups on top of ds/branch-checked-out Jeff King
2022-06-19 3:53 ` [PATCH 1/2] fetch: stop passing around unused worktrees variable Jeff King
2022-06-19 3:55 ` [PATCH 2/2] branch: drop " Jeff King
2022-06-20 19:09 ` Ævar Arnfjörð Bjarmason
2022-07-01 18:24 ` Jeff King
2022-06-21 15:56 ` Junio C Hamano [this message]
2022-06-19 18:12 ` [PATCH 0/2] extra cleanups on top of ds/branch-checked-out Derrick Stolee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzgi6hux8.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).