From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D33F08F62 for ; Thu, 19 Oct 2023 07:42:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cFvgRsXb" Received: from mail-yw1-x112d.google.com (mail-yw1-x112d.google.com [IPv6:2607:f8b0:4864:20::112d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84B4DF7 for ; Thu, 19 Oct 2023 00:41:54 -0700 (PDT) Received: by mail-yw1-x112d.google.com with SMTP id 00721157ae682-5a7a80a96dbso4206937b3.0 for ; Thu, 19 Oct 2023 00:41:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697701313; x=1698306113; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9lQ3imhDm795JiNG6BbfRdHxt4p1mUGjT86xDOxUmJg=; b=cFvgRsXb35CzornFUy4TPDdjBq8hwTvAhIe+yWpDzCDLnDmhRVHlZBkrYcDKIgPLiD eGVTr92vbUJ2Sup3pdlBLGUveu8zGKFL9bX1M8COj/hfeO/4vCIm2Q2TZWPHrq6EpShg QDwP7sSLMc+E/1kFxnH8tKpGrOyiKAFg+UamWmHwAIagsAuIlGXWQtjZF7hkrolpdJzw GUtQRPKtxpaJsTWNS2XYvP/Yd1/xwRolANcahoOWpuIw0wrGPCMCiD84+lV5/b20ljjN 2NzjFdXbo7nCvhoWIoLd6FlzCBql0fSXF/7+VIlMEIk1Sf6UDqmaldlveV9CXQubyp9U KlOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697701313; x=1698306113; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9lQ3imhDm795JiNG6BbfRdHxt4p1mUGjT86xDOxUmJg=; b=BFUsnhkaq1c6IaD3DNtqvaClQs34sQYvfXwjOBPfSHZHE0kNIP25kefF/X2S4tmfcb 5MMUhC1VA+KfGMWpZZU6Q/8kVLT+n3nRsISKANGX6HHIyq7j86g4up9r0xqM/lTbUq5q Cl1zfNyo9F/53KT5sBO+9xWcm3LRDnPpFKQC5rz91BIgyAQPT85FKS/4xlxsyKeS35Wu 6bZW/JQOyZEMoWrHTbkywybxjbuQF/zVp1lYjuhD7SSZCZXxhPg8D8nR22d2K3NuD+9x o6e+tmrgTrxom2eRHb2c4IGNWptsPf148TMU+7jzbh7LuUnASKKRVHbDlbXl0Pl6UznQ Fopg== X-Gm-Message-State: AOJu0YziXQ5HOnCwx0ZneAnPGxSyST3AqRnG+MlGgI8pxWhyiAQycn+4 wUb27gSSdL5MuKkrJkbVSmNHkMEvwhXY6WPxqMI= X-Google-Smtp-Source: AGHT+IGl/j9AuVqvnW1h41joSCcwqsq7+AcTNhEL3/ZFZLrP3Wi9/qTELLC0hsID1rWCkIXbQmsHTw== X-Received: by 2002:a05:690c:fd6:b0:5a7:cb5f:ee0a with SMTP id dg22-20020a05690c0fd600b005a7cb5fee0amr882728ywb.17.1697701313293; Thu, 19 Oct 2023 00:41:53 -0700 (PDT) Received: from isoken-VirtualBox.. ([105.112.214.207]) by smtp.gmail.com with ESMTPSA id s124-20020a0de982000000b0059935151fa1sm2210963ywe.126.2023.10.19.00.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 00:41:53 -0700 (PDT) From: Isoken June Ibizugbe To: git@vger.kernel.org Cc: rjusto@gmail.com, christian.couder@gmail.com, gitster@pobox.com, Isoken June Ibizugbe Subject: [Outreachy][PATCH v2] builtin/branch.c: adjust error messages to coding guidelines Date: Thu, 19 Oct 2023 08:41:26 +0100 Message-ID: <20231019074126.567638-1-isokenjune@gmail.com> X-Mailer: git-send-email 2.42.0.346.g24618a8a3e.dirty Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Isoken June Ibizugbe --- builtin/branch.c | 66 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 2ec190b14a..938c40bfaa 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; @@ -518,11 +518,11 @@ static void reject_rebase_or_bisect_branch(struct worktree **worktrees, continue; if (is_worktree_being_rebased(wt, target)) - die(_("Branch %s is being rebased at %s"), + die(_("branch %s is being rebased at %s"), target, wt->path); if (is_worktree_being_bisected(wt, target)) - die(_("Branch %s is being bisected at %s"), + die(_("branch %s is being bisected at %s"), target, wt->path); } } @@ -578,7 +578,7 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int if (ref_exists(oldref.buf)) recovery = 1; else - die(_("Invalid branch name: '%s'"), oldname); + die(_("invalid branch name: '%s'"), oldname); } for (int i = 0; worktrees[i]; i++) { @@ -594,9 +594,9 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int if ((copy || !(oldref_usage & IS_HEAD)) && !ref_exists(oldref.buf)) { if (oldref_usage & IS_HEAD) - die(_("No commit on branch '%s' yet."), oldname); + die(_("no commit on branch '%s' yet"), oldname); else - die(_("No branch named '%s'."), oldname); + die(_("no branch named '%s'"), oldname); } /* @@ -624,32 +624,32 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int if (!copy && !(oldref_usage & IS_ORPHAN) && rename_ref(oldref.buf, newref.buf, logmsg.buf)) - die(_("Branch rename failed")); + die(_("branch rename failed")); if (copy && copy_existing_ref(oldref.buf, newref.buf, logmsg.buf)) - die(_("Branch copy failed")); + die(_("branch copy failed")); 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); strbuf_addf(&oldsection, "branch.%s", interpreted_oldname); strbuf_addf(&newsection, "branch.%s", interpreted_newname); if (!copy && git_config_rename_section(oldsection.buf, newsection.buf) < 0) - die(_("Branch is renamed, but update of config-file failed")); + die(_("branch is renamed, but update of config-file failed")); if (copy && strcmp(interpreted_oldname, interpreted_newname) && git_config_copy_section(oldsection.buf, newsection.buf) < 0) - die(_("Branch is copied, but update of config-file failed")); + die(_("branch is copied, but update of config-file failed")); strbuf_release(&oldref); strbuf_release(&newref); strbuf_release(&oldsection); @@ -773,7 +773,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) head = resolve_refdup("HEAD", 0, &head_oid, NULL); if (!head) - die(_("Failed to resolve HEAD as a valid ref.")); + die(_("failed to resolve HEAD as a valid ref")); if (!strcmp(head, "HEAD")) filter.detached = 1; else if (!skip_prefix(head, "refs/heads/", &head)) @@ -866,7 +866,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (!argc) { if (filter.detached) - die(_("Cannot give description to detached HEAD")); + die(_("cannot give description to detached HEAD")); branch_name = head; } else if (argc == 1) { strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL); @@ -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 */ @@ -892,8 +892,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (!argc) 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.")); + die(copy? _("cannot copy 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) @@ -916,14 +916,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (!branch) { if (!argc || !strcmp(argv[0], "HEAD")) die(_("could not set upstream of HEAD to %s when " - "it does not point to any branch."), + "it does not point to any branch"), new_upstream); die(_("no such branch '%s'"), argv[0]); } if (!ref_exists(branch->refname)) { if (!argc || branch_checked_out(branch->refname)) - die(_("No commit on branch '%s' yet."), branch->name); + die(_("no commit on branch '%s' yet"), branch->name); die(_("branch '%s' does not exist"), branch->name); } @@ -946,12 +946,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (!branch) { if (!argc || !strcmp(argv[0], "HEAD")) die(_("could not unset upstream of HEAD when " - "it does not point to any branch.")); + "it does not point to any branch")); die(_("no such branch '%s'"), argv[0]); } if (!branch_has_merge_config(branch)) - die(_("Branch '%s' has no upstream information"), branch->name); + die(_("branch '%s' has no upstream information"), branch->name); strbuf_reset(&buf); strbuf_addf(&buf, "branch.%s.remote", branch->name); @@ -965,11 +965,11 @@ 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 ?")); if (track == BRANCH_TRACK_OVERRIDE) - die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.")); + die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead")); if (recurse_submodules) { create_branches_recursively(the_repository, branch_name, -- 2.42.0.346.g24618a8a3e.dirty