[v2,0/2] branch: support for shortcuts like @{-1}, completed

Message

Rubén Justo Sept. 7, 2022, 9:45 a.m. UTC

branch options: "edit-description", "set-upstream-to" and "unset-upstream"
don't handle shortcuts like @{-1}.

This patch address this problem.

In v2 I've resolved some noise in the code, aggregated two tests in one with
some refactoring to do the test in a more simple way while covering the
functionality. Also changed the commit messages to better explain and
document the change.

Thanks


Rubén Justo (2):
  branch: refactor "edit_description" code path
  branch: support for shortcuts like @{-1} completed

 builtin/branch.c                      | 46 ++++++++++++++++++---------
 t/t3204-branch-name-interpretation.sh | 25 +++++++++++++++
 2 files changed, 56 insertions(+), 15 deletions(-)

base-commit: 795ea8776befc95ea2becd8020c7a284677b4161

Range-diff vs v1:

1:  aaa2f3ec31 ! 1:  ce14194187 branch: refactor edit_description command switch case
    @@ Metadata
     Author: Rubén Justo <[e-mail]>
     
      ## Commit message ##
    -    branch: refactor edit_description command switch case
    +    branch: refactor "edit_description" code path
     
    -    Minor refactoring to reduce the return exits in the switch case
    -    handling the edit_description command, so the calls to strbuf_release
    -    can also be reduced.
    +    Minor refactoring to reduce the number of returns in the switch case
    +    handling the "edit_description" option, so the calls to strbuf_release
    +    can also be reduced.  New resources to be added also do not need to be
    +    released in multiple places.
     
         Signed-off-by: Rubén Justo <[e-mail]>
     
2:  321854e118 ! 2:  3a591cab8a branch: support for at-refs like @{-1}
    @@ Metadata
     Author: Rubén Justo <[e-mail]>
     
      ## Commit message ##
    -    branch: support for at-refs like @{-1}
    +    branch: support for shortcuts like @{-1} completed
     
    -    branch command with --edit-description, --set-upstream-to and
    -    --unset-upstream options expects a branch name. A branch can be
    -    specified using at-refs like @{-1}, so those references need to
    -    be resolved.
    +    branch command with options "edit-description", "set-upstream-to"
    +    and "unset-upstream" expects a branch name.  Since ae5a6c3684
    +    (checkout: implement "@{-N}" shortcut name for N-th last branch,
    +    2009-01-17) a branch can be specified using shortcuts like @{-1}.
    +    Those shortcuts need to be resolved when considering the
    +    arguments.
    +
    +    Usage examples:
     
         We can modify the description of the previously checked out branch
         with:
    @@ builtin/branch.c: int cmd_branch(int argc, const char **argv, const char *prefix
     +		else if (argc == 1) {
     +			strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL);
     +			branch = branch_get(buf.buf);
    -+		}
    -+		else
    ++		} else
      			die(_("too many arguments to set new upstream"));
      
    -+
      		if (!branch) {
    - 			if (!argc || !strcmp(argv[0], "HEAD"))
    - 				die(_("could not set upstream of HEAD to %s when "
     @@ builtin/branch.c: int cmd_branch(int argc, const char **argv, const char *prefix)
      		dwim_and_setup_tracking(the_repository, branch->name,
      					new_upstream, BRANCH_TRACK_OVERRIDE,
    @@ builtin/branch.c: int cmd_branch(int argc, const char **argv, const char *prefix
     +		else if (argc == 1) {
     +			strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL);
     +			branch = branch_get(buf.buf);
    -+		}
    -+		else
    ++		} else
      			die(_("too many arguments to unset upstream"));
      
      		if (!branch) {
    @@ t/t3204-branch-name-interpretation.sh: test_expect_success 'checkout does not tr
     +	test_cmp expect EDITOR_OUTPUT
     +'
     +
    -+test_expect_success 'modify branch upstream via "@{-1}@{upstream}"' "
    -+	cat >expect <<-\EOF &&
    -+	warning: not setting branch 'upstream-branch' as its own upstream
    -+	EOF
    ++test_expect_success 'modify branch upstream via "@{-1}" and "@{-1}@{upstream}"' '
     +	git branch upstream-branch &&
     +	git checkout -b upstream-other -t upstream-branch &&
     +	git checkout - &&
    -+	git branch --set-upstream-to upstream-branch @{-1}@{upstream} 2>actual &&
    -+	test_cmp expect actual
    -+"
    -+
    -+test_expect_success 'unset branch upstream via "@{-1}"' "
    -+	test "$(git config branch.upstream-other.remote)" = "." &&
    -+	test "$(git config branch.upstream-other.merge)" = "refs/heads/upstream-branch" &&
    -+	git checkout upstream-other &&
    -+	git checkout - &&
    ++	git branch --set-upstream-to @{-1} @{-1}@{upstream} &&
    ++	test "$(git config branch.upstream-branch.merge)" = "refs/heads/upstream-other" &&
     +	git branch --unset-upstream @{-1} &&
    -+	test_must_fail git config branch.upstream-other.remote &&
     +	test_must_fail git config branch.upstream-other.merge
    -+"
    ++'
     +
      test_done