diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-17 23:56:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-17 23:56:33 +0200 |
| commit | 272be0db8b732617245930b92c9a79a1fc5b4398 (patch) | |
| tree | 109beb70c9857c9feed44f3a0f0a2be99876ddd0 /t/t3200-branch.sh | |
| parent | Merge branch 'jk/cleanup-callback-parameters' (diff) | |
| parent | branch: do not fail a no-op --edit-desc (diff) | |
| download | git-272be0db8b732617245930b92c9a79a1fc5b4398.tar.xz git-272be0db8b732617245930b92c9a79a1fc5b4398.zip | |
Merge branch 'jc/branch-description-unset'
"GIT_EDITOR=: git branch --edit-description" resulted in failure,
which has been corrected.
* jc/branch-description-unset:
branch: do not fail a no-op --edit-desc
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index b82cffc0b3..d5a1fc1375 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -1381,6 +1381,9 @@ test_expect_success 'branch --delete --force removes dangling branch' ' ' test_expect_success 'use --edit-description' ' + EDITOR=: git branch --edit-description && + test_must_fail git config branch.main.description && + write_script editor <<-\EOF && echo "New contents" >"$1" EOF |