]> git.ipfire.org Git - thirdparty/git.git/commitdiff
branch: drop unused worktrees variable
authorJeff King <peff@peff.net>
Sun, 19 Jun 2022 03:55:16 +0000 (23:55 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Jun 2022 15:52:37 +0000 (08:52 -0700)
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>
builtin/branch.c

index f875952e7b5b803fa32ebe3e3af70697978c08c9..55cd9a6e9984fc66334a7e78bd65294c628e34fb 100644 (file)
@@ -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;
 }