diff options
| author | Rubén Justo <rjusto@gmail.com> | 2023-03-27 00:33:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-27 09:40:15 -0700 |
| commit | 3521c6321350cf1432f4772efa09db8bec0aa331 (patch) | |
| tree | 359c72c3e0bf028fb43ff0923cabda2cf54929f3 | |
| parent | a675ad1708383f47883d0bb0b2dada827a295acd (diff) | |
| download | git-3521c6321350cf1432f4772efa09db8bec0aa331.tar.gz | |
branch: avoid unnecessary worktrees traversals
When we rename a branch ref, we need to update any worktree that have
its HEAD pointing to the branch ref being renamed, so to make it use the
new ref name.
If we know in advance that we're renaming a branch that is not currently
checked out in any worktree, we can skip this step entirely. Let's do
it so.
Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index a93b9fc0ab..6a564b22b0 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -617,7 +617,7 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int interpreted_oldname); } - if (!copy && + if (!copy && (oldref_usage & IS_HEAD) && replace_each_worktree_head_symref(worktrees, oldref.buf, newref.buf, logmsg.buf)) die(_("Branch renamed to %s, but HEAD is not updated!"), newname); |