summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
diff options
context:
space:
mode:
authorRubén Justo <rjusto@gmail.com>2022-10-26 00:57:18 +0200
committerJunio C Hamano <gitster@pobox.com>2022-10-26 10:52:37 -0700
commit8f241151656053e3ae130e9e0025b9cf71ccc3ce (patch)
tree87b8fd8798a6076d9a1c92cacace5a5074696a49 /t/t3200-branch.sh
parentdb29e6bbaed156ae9025ff0474fd788e58230367 (diff)
downloadgit-8f241151656053e3ae130e9e0025b9cf71ccc3ce.tar.gz
branch: error code with --edit-description
Since c2d17ba3db0d (branch --edit-description: protect against mistyped branch name, 2012-02-05) we return -1 on error editing the branch description. Let's change to 1, which follows the established convention and it is better for portability reasons. Signed-off-by: Rubén Justo <rjusto@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 7d8edff9c3..a390394b4c 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -1383,7 +1383,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"