diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-21 11:37:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-21 11:37:29 -0700 |
| commit | c2058ea237604d3ba7570f355c7832b9e467d6cb (patch) | |
| tree | 008c2daed13c772426c11f2bbdcc0d65bf1dcca5 /t/t3204-branch-name-interpretation.sh | |
| parent | 1f20aa22d7bdb4fb1132f703620a8a2ddeee1162 (diff) | |
| parent | 0dc4e5c57498cc142cbcc9e8a5f0667368d7c860 (diff) | |
Merge branch 'rj/branch-edit-description-with-nth-checkout'
"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
Diffstat (limited to 't/t3204-branch-name-interpretation.sh')
| -rwxr-xr-x | t/t3204-branch-name-interpretation.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t3204-branch-name-interpretation.sh b/t/t3204-branch-name-interpretation.sh index 993a6b5eff..793bf4d269 100755 --- a/t/t3204-branch-name-interpretation.sh +++ b/t/t3204-branch-name-interpretation.sh @@ -133,4 +133,28 @@ test_expect_success 'checkout does not treat remote @{upstream} as a branch' ' 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 |