From: Junio C Hamano <gitster@pobox•com>
To: Anders Kaseorg <andersk@mit•edu>
Cc: git@vger•kernel.org,
"Johannes Schindelin" <Johannes.Schindelin@gmx•de>,
"Jeff King" <peff@peff•net>,
"Andreas Heiduk" <andreas.heiduk@mathema•de>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail•com>
Subject: Re: [PATCH v6 6/8] receive-pack: clean dead code from update_worktree()
Date: Mon, 15 Nov 2021 21:49:10 -0800 [thread overview]
Message-ID: <xmqqv90sbqg9.fsf@gitster.g> (raw)
In-Reply-To: 20211113033358.2179376-7-andersk@mit.edu
Anders Kaseorg <andersk@mit•edu> writes:
> update_worktree() can only be called with a non-NULL worktree parameter,
> because that’s the only case where we set do_update_worktree = 1.
> worktree->path is always initialized to non-NULL.
Yup. I remember seeing this analysed in earlier rounds' reviews.
Nice lossage of lines ;-)
>
> Signed-off-by: Anders Kaseorg <andersk@mit•edu>
> ---
> builtin/receive-pack.c | 23 +++++++----------------
> 1 file changed, 7 insertions(+), 16 deletions(-)
>
> diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
> index 5d7c4832c1..b04d4ad268 100644
> --- a/builtin/receive-pack.c
> +++ b/builtin/receive-pack.c
> @@ -1444,29 +1444,22 @@ static const char *push_to_checkout(unsigned char *hash,
>
> static const char *update_worktree(unsigned char *sha1, const struct worktree *worktree)
> {
> - const char *retval, *work_tree, *git_dir = NULL;
> + const char *retval, *git_dir;
> struct strvec env = STRVEC_INIT;
>
> - if (worktree && worktree->path)
> - work_tree = worktree->path;
> - else if (git_work_tree_cfg)
> - work_tree = git_work_tree_cfg;
> - else
> - work_tree = "..";
> + if (!worktree || !worktree->path)
> + BUG("worktree->path must be non-NULL");
>
> if (is_bare_repository())
> return "denyCurrentBranch = updateInstead needs a worktree";
> - if (worktree)
> - git_dir = get_worktree_git_dir(worktree);
> - if (!git_dir)
> - git_dir = get_git_dir();
> + git_dir = get_worktree_git_dir(worktree);
>
> strvec_pushf(&env, "GIT_DIR=%s", absolute_path(git_dir));
>
> if (!find_hook(push_to_checkout_hook))
> - retval = push_to_deploy(sha1, &env, work_tree);
> + retval = push_to_deploy(sha1, &env, worktree->path);
> else
> - retval = push_to_checkout(sha1, &env, work_tree);
> + retval = push_to_checkout(sha1, &env, worktree->path);
>
> strvec_clear(&env);
> return retval;
> @@ -1587,9 +1580,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
> }
>
> if (do_update_worktree) {
> - ret = update_worktree(new_oid->hash,
> - find_shared_symref(worktrees, "HEAD",
> - name));
> + ret = update_worktree(new_oid->hash, worktree);
> if (ret)
> goto out;
> }
next prev parent reply other threads:[~2021-11-16 5:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-13 3:33 [PATCH v6 0/8] protect branches checked out in all worktrees Anders Kaseorg
2021-11-13 3:33 ` [PATCH v6 1/8] fetch: lowercase error messages Anders Kaseorg
2021-11-16 5:19 ` Junio C Hamano
2021-11-16 7:10 ` Anders Kaseorg
2021-11-17 8:09 ` Junio C Hamano
2021-11-22 1:14 ` Jiang Xin
2021-11-13 3:33 ` [PATCH v6 2/8] receive-pack: " Anders Kaseorg
2021-11-18 4:53 ` Junio C Hamano
2021-11-13 3:33 ` [PATCH v6 3/8] branch: " Anders Kaseorg
2021-11-13 3:33 ` [PATCH v6 4/8] worktree: simplify find_shared_symref() memory ownership model Anders Kaseorg
2021-11-16 5:39 ` Junio C Hamano
2021-11-22 12:45 ` Johannes Schindelin
2021-11-13 3:33 ` [PATCH v6 5/8] fetch: protect branches checked out in all worktrees Anders Kaseorg
2021-11-16 5:49 ` Junio C Hamano
2021-11-16 6:44 ` Anders Kaseorg
2021-11-22 13:13 ` Johannes Schindelin
2021-11-13 3:33 ` [PATCH v6 6/8] receive-pack: clean dead code from update_worktree() Anders Kaseorg
2021-11-16 5:49 ` Junio C Hamano [this message]
2021-11-13 3:33 ` [PATCH v6 7/8] receive-pack: protect current branch for bare repository worktree Anders Kaseorg
2021-11-13 3:33 ` [PATCH v6 8/8] branch: protect branches checked out in all worktrees Anders Kaseorg
2021-11-22 13:21 ` [PATCH v6 0/8] " Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqv90sbqg9.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=andersk@mit$(echo .)edu \
--cc=andreas.heiduk@mathema$(echo .)de \
--cc=avarab@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox