diff options
| author | Anders Kaseorg <andersk@mit.edu> | 2021-12-01 14:15:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-01 22:18:25 -0800 |
| commit | 7435e7e2e7645124679eedbfb1443b8408f29219 (patch) | |
| tree | 1f628a8bb044de33b18dae2c57e2d295e04a847d /branch.c | |
| parent | c25edee9a5dd9481e00ee5d2d40d4b9f8231993f (diff) | |
| download | git-7435e7e2e7645124679eedbfb1443b8408f29219.tar.gz | |
branch: lowercase error messages
Documentation/CodingGuidelines says “do not end error messages with a
full stop” and “do not capitalize the first word”. Clean up existing
messages, some of which we will be touching in later steps in the
series, that deviate from these rules in this file, as a preparation for
the main part of the topic.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.c')
| -rw-r--r-- | branch.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -64,7 +64,7 @@ int install_branch_config(int flag, const char *local, const char *origin, const if (skip_prefix(remote, "refs/heads/", &shortname) && !strcmp(local, shortname) && !origin) { - warning(_("Not setting branch %s as its own upstream."), + warning(_("not setting branch %s as its own upstream"), local); return 0; } @@ -116,7 +116,7 @@ int install_branch_config(int flag, const char *local, const char *origin, const out_err: strbuf_release(&key); - error(_("Unable to write upstream branch configuration")); + error(_("unable to write upstream branch configuration")); advise(_(tracking_advice), origin ? origin : "", @@ -153,7 +153,7 @@ static void setup_tracking(const char *new_ref, const char *orig_ref, } if (tracking.matches > 1) - die(_("Not tracking: ambiguous information for ref %s"), + die(_("not tracking: ambiguous information for ref %s"), orig_ref); if (install_branch_config(config_flags, new_ref, tracking.remote, @@ -186,7 +186,7 @@ int read_branch_desc(struct strbuf *buf, const char *branch_name) int validate_branchname(const char *name, struct strbuf *ref) { if (strbuf_check_branch_ref(ref, name)) - die(_("'%s' is not a valid branch name."), name); + die(_("'%s' is not a valid branch name"), name); return ref_exists(ref->buf); } @@ -205,12 +205,12 @@ int validate_new_branchname(const char *name, struct strbuf *ref, int force) return 0; if (!force) - die(_("A branch named '%s' already exists."), + die(_("a branch named '%s' already exists"), ref->buf + strlen("refs/heads/")); head = resolve_ref_unsafe("HEAD", 0, NULL, NULL); if (!is_bare_repository() && head && !strcmp(head, ref->buf)) - die(_("Cannot force update the current branch.")); + die(_("cannot force update the current branch")); return 1; } @@ -230,7 +230,7 @@ static int validate_remote_tracking_branch(char *ref) } static const char upstream_not_branch[] = -N_("Cannot setup tracking information; starting point '%s' is not a branch."); +N_("cannot set up tracking information; starting point '%s' is not a branch"); static const char upstream_missing[] = N_("the requested upstream branch '%s' does not exist"); static const char upstream_advice[] = @@ -278,7 +278,7 @@ void create_branch(struct repository *r, } die(_(upstream_missing), start_name); } - die(_("Not a valid object name: '%s'."), start_name); + die(_("not a valid object name: '%s'"), start_name); } switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref, 0)) { @@ -298,12 +298,12 @@ void create_branch(struct repository *r, } break; default: - die(_("Ambiguous object name: '%s'."), start_name); + die(_("ambiguous object name: '%s'"), start_name); break; } if ((commit = lookup_commit_reference(r, &oid)) == NULL) - die(_("Not a valid branch point: '%s'."), start_name); + die(_("not a valid branch point: '%s'"), start_name); oidcpy(&oid, &commit->object.oid); if (reflog) |