diff options
| author | Rubén Justo <rjusto@gmail.com> | 2022-10-26 00:57:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-26 10:52:37 -0700 |
| commit | 8f241151656053e3ae130e9e0025b9cf71ccc3ce (patch) | |
| tree | 87b8fd8798a6076d9a1c92cacace5a5074696a49 | |
| parent | Sync with 'maint' (diff) | |
| download | git-8f241151656053e3ae130e9e0025b9cf71ccc3ce.tar.gz git-8f241151656053e3ae130e9e0025b9cf71ccc3ce.zip | |
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>
| -rw-r--r-- | builtin/branch.c | 2 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 407517ba68..4df001f579 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -816,7 +816,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); if (!ref_exists(branch_ref.buf)) - ret = error((!argc || !strcmp(head, branch_name)) + error((!argc || !strcmp(head, branch_name)) ? _("No commit on branch '%s' yet.") : _("No branch named '%s'."), branch_name); 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" |