undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rj/branch-edit-description-with-nth-checkout'

Browse Source 
"git branch --edit-description @{-1}" is now a way to edit branch
description of the branch you were on before switching to the
current branch.

* rj/branch-edit-description-with-nth-checkout:
  branch: support for shortcuts like @{-1}, completed
This commit is contained in:
Junio C Hamano 2022-10-21 11:37:29 -07:00
commit c2058ea237
2 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
builtin/branch.c
View File

@ -800,31 +800,33 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
} else if (edit_description) { } else if (edit_description) {
const char *branch_name; const char *branch_name;
struct strbuf branch_ref = STRBUF_INIT; struct strbuf branch_ref = STRBUF_INIT;
struct strbuf buf = STRBUF_INIT;
int ret = 1; /* assume failure */
if (!argc) { if (!argc) {
if (filter.detached) if (filter.detached)
die(_("Cannot give description to detached HEAD")); die(_("Cannot give description to detached HEAD"));
branch_name = head; branch_name = head;
} else if (argc == 1) } else if (argc == 1) {
branch_name = argv[0]; strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL);
else branch_name = buf.buf;
} else {
die(_("cannot edit description of more than one branch")); die(_("cannot edit description of more than one branch"));
}
strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); strbuf_addf(&branch_ref, "refs/heads/%s", branch_name);
if (!ref_exists(branch_ref.buf)) { if (!ref_exists(branch_ref.buf))
strbuf_release(&branch_ref); ret = error((!argc || !strcmp(head, branch_name))
? _("No commit on branch '%s' yet.")
if (!argc || !strcmp(head, branch_name)) : _("No branch named '%s'."),
return error(_("No commit on branch '%s' yet."),
branch_name); branch_name);
else else if (!edit_branch_description(branch_name))
return error(_("No branch named '%s'."), ret = 0; /* happy */
branch_name);
}
strbuf_release(&branch_ref);
if (edit_branch_description(branch_name)) strbuf_release(&branch_ref);
return 1; strbuf_release(&buf);
return ret;
} else if (copy) { } else if (copy) {
if (!argc) if (!argc)
die(_("branch name required")); die(_("branch name required"));
@ -844,9 +846,15 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
else else
die(_("too many arguments for a rename operation")); die(_("too many arguments for a rename operation"));
} else if (new_upstream) { } else if (new_upstream) {
struct branch *branch = branch_get(argv[0]); struct branch *branch;
struct strbuf buf = STRBUF_INIT;
if (argc > 1) if (!argc)
branch = branch_get(NULL);
else if (argc == 1) {
strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL);
branch = branch_get(buf.buf);
} else
die(_("too many arguments to set new upstream")); die(_("too many arguments to set new upstream"));
if (!branch) { if (!branch) {
@ -866,11 +874,17 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
dwim_and_setup_tracking(the_repository, branch->name, dwim_and_setup_tracking(the_repository, branch->name,
new_upstream, BRANCH_TRACK_OVERRIDE, new_upstream, BRANCH_TRACK_OVERRIDE,
quiet); quiet);
strbuf_release(&buf);
} else if (unset_upstream) { } else if (unset_upstream) {
struct branch *branch = branch_get(argv[0]); struct branch *branch;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
if (argc > 1) if (!argc)
branch = branch_get(NULL);
else if (argc == 1) {
strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL);
branch = branch_get(buf.buf);
} else
die(_("too many arguments to unset upstream")); die(_("too many arguments to unset upstream"));
if (!branch) { if (!branch) {
@ -883,6 +897,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (!branch_has_merge_config(branch)) if (!branch_has_merge_config(branch))
die(_("Branch '%s' has no upstream information"), branch->name); die(_("Branch '%s' has no upstream information"), branch->name);
strbuf_reset(&buf);
strbuf_addf(&buf, "branch.%s.remote", branch->name); strbuf_addf(&buf, "branch.%s.remote", branch->name);
git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE); git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
strbuf_reset(&buf); strbuf_reset(&buf);

24
t/t3204-branch-name-interpretation.sh
View File

@ -133,4 +133,28 @@ test_expect_success 'checkout does not treat remote @{upstream} as a branch' '
expect_branch HEAD one expect_branch HEAD one
' '
test_expect_success 'edit-description via @{-1}' '
git checkout -b desc-branch &&
git checkout -b non-desc-branch &&
write_script editor <<-\EOF &&
echo "Branch description" >"$1"
EOF
EDITOR=./editor git branch --edit-description @{-1} &&
test_must_fail git config branch.non-desc-branch.description &&
git config branch.desc-branch.description >actual &&
printf "Branch description\n\n" >expect &&
test_cmp expect actual
'
test_expect_success 'modify branch upstream via "@{-1}" and "@{-1}@{upstream}"' '
git checkout -b upstream-branch &&
git checkout -b upstream-other -t upstream-branch &&
git branch --set-upstream-to upstream-other @{-1} &&
git config branch.upstream-branch.merge >actual &&
echo "refs/heads/upstream-other" >expect &&
test_cmp expect actual &&
git branch --unset-upstream @{-1}@{upstream} &&
test_must_fail git config branch.upstream-other.merge
'
test_done test_done