From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Alex Henrie" <alexhenrie24@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Randall S . Becker" <rsbecker@nexbridge.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Denton Liu" <liu.denton@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH 1/7] merge: improve fatal fast-forward message
Date: Wed, 21 Jul 2021 19:08:48 -0500 [thread overview]
Message-ID: <20210722000854.1899129-2-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210722000854.1899129-1-felipe.contreras@gmail.com>
The documentation of --ff-only says:
With `--ff-only`, resolve the merge as a fast-forward when possible.
When not possible, refuse to merge and exit with a non-zero status.
So when the user does --ff-only, and a fast-forward is not possible, the
user wants git to abort, therefore an error message of:
fatal: Not possible to fast-forward, aborting.
is redundant; no need to say ", aborting".
Additionally, use lowercase and lose the full stop to be consistent with
other die() messages.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index a8a843b1f5..05e631229d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1620,7 +1620,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
}
if (fast_forward == FF_ONLY)
- die(_("Not possible to fast-forward, aborting."));
+ die(_("unable to fast-forward"));
if (autostash)
create_autostash(the_repository,
--
2.32.0.40.gb9b36f9b52
next prev parent reply other threads:[~2021-07-22 0:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 0:08 [PATCH 0/7] fast-forward: new command with advice and documentation Felipe Contreras
2021-07-22 0:08 ` Felipe Contreras [this message]
2021-07-22 0:08 ` [PATCH 2/7] merge: add diverging advice for novices Felipe Contreras
2021-07-22 0:08 ` [PATCH 3/7] merge: make the diverging advise configurable Felipe Contreras
2021-07-22 0:08 ` [PATCH 4/7] merge: split cmd_merge() Felipe Contreras
2021-07-22 0:08 ` [PATCH 5/7] fast-forward: add new builtin Felipe Contreras
2021-07-22 0:08 ` [PATCH 6/7] doc: fast-forward: explain what it is Felipe Contreras
2021-07-22 0:08 ` [PATCH 7/7] fast-forward: add help about merge vs. rebase Felipe Contreras
2021-07-22 22:57 ` Philip Oakley
2021-07-23 17:10 ` Felipe Contreras
2021-07-23 19:14 ` Philip Oakley
2021-07-23 20:14 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210722000854.1899129-2-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=newren@gmail.com \
--cc=pclouds@gmail.com \
--cc=rsbecker@nexbridge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).