diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:43 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:43 -0400 |
| commit | bf0d9d0d347ddee86d4e848c70584666d384f026 (patch) | |
| tree | 61b32f55648341cd615215475c44ed00b0759ea2 /builtin/branch.c | |
| parent | Merge branch 'rj/branch-copy-rename-error-codepath-cleanup' (diff) | |
| parent | branch: error code with --edit-description (diff) | |
| download | git-bf0d9d0d347ddee86d4e848c70584666d384f026.tar.gz 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 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index c964ac7bb4..15be0c03ef 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -809,7 +809,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); |