summaryrefslogtreecommitdiffstats
path: root/t/t3200-branch.sh
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2022-10-31 02:04:43 +0100
committerTaylor Blau <me@ttaylorr.com>2022-10-31 02:04:43 +0100
commitbf0d9d0d347ddee86d4e848c70584666d384f026 (patch)
tree61b32f55648341cd615215475c44ed00b0759ea2 /t/t3200-branch.sh
parentMerge branch 'rj/branch-copy-rename-error-codepath-cleanup' (diff)
parentbranch: error code with --edit-description (diff)
downloadgit-bf0d9d0d347ddee86d4e848c70584666d384f026.tar.xz
git-bf0d9d0d347ddee86d4e848c70584666d384f026.zip
Merge branch 'rj/branch-do-not-exit-with-minus-one-status'
"git branch --edit-description" can exit with status -1 which is not a good practice; it learned to use 1 as everybody else instead. * rj/branch-do-not-exit-with-minus-one-status: branch: error code with --edit-description
Diffstat (limited to 't/t3200-branch.sh')
-rwxr-xr-xt/t3200-branch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 38c57de71b..7f605f865b 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -1394,7 +1394,7 @@ 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 &&
+ test_expect_code 1 git config branch.main.description &&
write_script editor <<-\EOF &&
echo "New contents" >"$1"