Re: [PATCH v4 2/3] branch: description for orphan branch errors

From: Jonathan Tan <jonathantanmy@google.com>
Date: Feb 27, 2023, 19:38 UTC
Message-ID: <20230227193839.2416545-1-jonathantanmy@google.com>
In-Reply-To: <76bac570-147e-7c74-c18c-1da88bc3d342@gmail.com>

Firstly, the subject could be more precise. Maybe "branch: check all worktrees for orphan branches" (47 characters) or something like that.

Rubén Justo <rjusto@gmail.com> writes:

> In bcfc82bd48 (branch: description for non-existent branch errors,
> 2022-10-08) we checked the current HEAD

Probably clearer to say "HEAD in the current worktree" instead of "current HEAD".

Show 7 quoted lines

> to detect if the branch to
> operate with is an orphan branch, so as to avoid the confusing error:
> "No branch named...".
> 
> If we are asked to operate with an orphan branch in a different working
> tree than the current one, we need to check the HEAD in that different
> working tree.

Probably clearer to just say "But there might be orphan branches in other worktrees".

> Let's extend the check we did in bcfc82bd48, to all HEADs in the
> repository, using the helper introduced in 31ad6b61bd (branch: add
> branch_checked_out() helper, 2022-06-15)

s/HEADs/worktrees/

Show 8 quoted lines

> @@ -493,8 +496,9 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
>  	struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
>  	const char *interpreted_oldname = NULL;
>  	const char *interpreted_newname = NULL;
> -	int recovery = 0;
> +	int recovery = 0, oldref_usage = 0;
>  	struct worktree **worktrees = get_worktrees();
> +	struct worktree *oldref_wt = NULL;

Better to have 2 variables (one for rebased, and one for bisected) to avoid the situation in which the last problematic worktree seen was a bisected one, but a prior one was a rebased one.

Show 18 quoted lines

> @@ -818,7 +835,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
>  
>  		strbuf_addf(&branch_ref, "refs/heads/%s", branch_name);
>  		if (!ref_exists(branch_ref.buf))
> -			error((!argc || !strcmp(head, branch_name))
> +			error((!argc || branch_checked_out(branch_ref.buf))
>  			      ? _("No commit on branch '%s' yet.")
>  			      : _("No branch named '%s'."),
>  			      branch_name);
> @@ -863,7 +880,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
>  		}
>  
>  		if (!ref_exists(branch->refname)) {
> -			if (!argc || !strcmp(head, branch->name))
> +			if (!argc || branch_checked_out(branch->refname))
>  				die(_("No commit on branch '%s' yet."), branch->name);
>  			die(_("branch '%s' does not exist"), branch->name);
>  		}

What is the relevance of these changes?