Browse Source

branch: drop unused worktrees variable

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 3 years ago committed by Junio C Hamano
parent
commit
9bef0b1e6e
  1. 4
      builtin/branch.c

4
builtin/branch.c

@ -204,7 +204,6 @@ static void delete_branch_config(const char *branchname) @@ -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, @@ -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, @@ -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;
}

Loading…
Cancel
Save