Re: [PATCH 2/2] branch.c: adjust error messages to coding guidelines

>
> From: Isoken June Ibizugbe <isokenjune@gmail.com>
>
> Signed-off-by: Isoken June Ibizugbe <isokenjune@gmail.com>
> ---
>  builtin/branch.c | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index a756543d644..e7ee9bd0f15 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -173,11 +173,11 @@ static int branch_merged(int kind, const char *name,
>             (head_rev ? repo_in_merge_bases(the_repository, rev, head_rev) : 0) != merged) {
>                 if (merged)
>                         warning(_("deleting branch '%s' that has been merged to\n"
> -                               "         '%s', but not yet merged to HEAD."),
> +                               "         '%s', but not yet merged to HEAD"),
>                                 name, reference_name);
>                 else
>                         warning(_("not deleting branch '%s' that is not yet merged to\n"
> -                               "         '%s', even though it is merged to HEAD."),
> +                               "         '%s', even though it is merged to HEAD"),
>                                 name, reference_name);
>         }
>         free(reference_name_to_free);
> @@ -190,13 +190,13 @@ static int check_branch_commit(const char *branchname, const char *refname,
>  {
>         struct commit *rev = lookup_commit_reference(the_repository, oid);
>         if (!force && !rev) {
> -               error(_("Couldn't look up commit object for '%s'"), refname);
> +               error(_("couldn't look up commit object for '%s'"), refname);
>                 return -1;
>         }
>         if (!force && !branch_merged(kinds, branchname, rev, head_rev)) {
> -               error(_("The branch '%s' is not fully merged.\n"
> +               error(_("the branch '%s' is not fully merged.\n"
>                       "If you are sure you want to delete it, "
> -                     "run 'git branch -D %s'."), branchname, branchname);
> +                     "run 'git branch -D %s'"), branchname, branchname);
>                 return -1;
>         }
>         return 0;
> @@ -207,7 +207,7 @@ static void delete_branch_config(const char *branchname)
>         struct strbuf buf = STRBUF_INIT;
>         strbuf_addf(&buf, "branch.%s", branchname);
>         if (git_config_rename_section(buf.buf, NULL) < 0)
> -               warning(_("Update of config-file failed"));
> +               warning(_("update of config-file failed"));
>         strbuf_release(&buf);
>  }
>
> @@ -260,7 +260,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
>                 if (kinds == FILTER_REFS_BRANCHES) {
>                         const char *path;
>                         if ((path = branch_checked_out(name))) {
> -                               error(_("Cannot delete branch '%s' "
> +                               error(_("cannot delete branch '%s' "
>                                         "used by worktree at '%s'"),
>                                       bname.buf, path);
>                                 ret = 1;
> @@ -275,7 +275,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
>                                         &oid, &flags);
>                 if (!target) {
>                         if (remote_branch) {
> -                               error(_("remote-tracking branch '%s' not found."), bname.buf);
> +                               error(_("remote-tracking branch '%s' not found"), bname.buf);
>                         } else {
>                                 char *virtual_name = mkpathdup(fmt_remotes, bname.buf);
>                                 char *virtual_target = resolve_refdup(virtual_name,
> @@ -290,7 +290,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
>                                                 "Did you forget --remote?"),
>                                                 bname.buf);
>                                 else
> -                                       error(_("branch '%s' not found."), bname.buf);
> +                                       error(_("branch '%s' not found"), bname.buf);
>                                 FREE_AND_NULL(virtual_target);
>                         }
>                         ret = 1;
> @@ -630,17 +630,17 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
>
>         if (recovery) {
>                 if (copy)
> -                       warning(_("Created a copy of a misnamed branch '%s'"),
> +                       warning(_("created a copy of a misnamed branch '%s'"),
>                                 interpreted_oldname);
>                 else
> -                       warning(_("Renamed a misnamed branch '%s' away"),
> +                       warning(_("renamed a misnamed branch '%s' away"),
>                                 interpreted_oldname);
>         }
>
>         if (!copy && (oldref_usage & IS_HEAD) &&
>             replace_each_worktree_head_symref(worktrees, oldref.buf, newref.buf,
>                                               logmsg.buf))
> -               die(_("branch renamed to %s, but HEAD is not updated!"), newname);
> +               die(_("branch renamed to %s, but HEAD is not updated"), newname);
>
>         strbuf_release(&logmsg);
>
> @@ -878,8 +878,8 @@ 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))
>                         error((!argc || branch_checked_out(branch_ref.buf))
> -                             ? _("No commit on branch '%s' yet.")
> -                             : _("No branch named '%s'."),
> +                             ? _("no commit on branch '%s' yet")
> +                             : _("no branch named '%s'"),
>                               branch_name);
>                 else if (!edit_branch_description(branch_name))
>                         ret = 0; /* happy */
> @@ -893,7 +893,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
>                         die(_("branch name required"));
>                 else if ((argc == 1) && filter.detached)
>                         die(copy? _("cannot copy the current branch while not on any")
> -                               : _("cannot rename the current branch while not on any."));
> +                               : _("cannot rename the current branch while not on any"));
>                 else if (argc == 1)
>                         copy_or_rename_branch(head, argv[0], copy, copy + rename > 1);
>                 else if (argc == 2)
> @@ -965,7 +965,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
>                 const char *start_name = argc == 2 ? argv[1] : head;
>
>                 if (filter.kind != FILTER_REFS_BRANCHES)
> -                       die(_("the -a, and -r, options to 'git branch' do not take a branch name\n"
> +                       die(_("the -a, and -r, options to 'git branch' do not take a branch name.\n"
>                                   "Did you mean to use: -a|-r --list <pattern>?"));
>
>                 if (track == BRANCH_TRACK_OVERRIDE)
> --
> gitgitgadget