From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Andrew Ardill <andrew.ardill@gmail.com>,
Christoph Paulik <cpaulik@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] merge: warn --no-commit merge when no new commit is created
Date: Tue, 26 Apr 2016 14:53:31 -0700 [thread overview]
Message-ID: <CAGZ79ka-HbB=oCidTtKSa32R9kqd2_c-cG8h+ttAVy=a8UfgFQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqd1pcdpb8.fsf_-_@gitster.mtv.corp.google.com>
On Tue, Apr 26, 2016 at 2:37 PM, Junio C Hamano <gitster@pobox.com> wrote:
> +static void no_commit_impossible(const char *message)
> +{
> + if (!option_commit) {
> + warning("%s\n%s", _(message),
> + _("--no-commit is impossible"));
> + warning(_("In future versions of Git, this will become an error."));
> + }
> +}
During discussion of the parallel process framework
(sb/submodule-parallel-fetch~3),
you seemed very inclined on not having major decisions made deep
inside the helper
function, but rather at the main function to easier see the program flow IIRC.
This looks very similar to me as we'll have the no_commit_impossible function
which is a helper of cmd_merge. Following your advice there, I would
have expected to
have
static void no_commit_impossible(const char *message)
{
warning("%s\n%s", _(message), _("--no-commit is impossible"));
warning(_("In future versions of Git, this will become an error."));
}
and later
if (!option_commit)
no_commit_impossible(_("Already up-to-date"));
> +
> int cmd_merge(int argc, const char **argv, const char *prefix)
> {
> unsigned char result_tree[20];
> @@ -1403,6 +1412,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
> * If head can reach all the merge then we are up to date.
> * but first the most common case of merging one remote.
> */
> + no_commit_impossible(_("Already up-to-date"));
> finish_up_to_date("Already up-to-date.");
Coming back to this patch, in case of -v given, we'll
see ("Already up-to-date") twice?
If --quiet is given, do we want to suppress output
in no_commit_impossible?
next prev parent reply other threads:[~2016-04-26 21:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-17 21:10 git merge branch --no-commit does commit fast forward merges Christoph Paulik
2016-04-17 23:52 ` Jacob Keller
2016-04-18 6:26 ` Johannes Schindelin
2016-04-18 7:09 ` Andrew Ardill
2016-04-18 7:23 ` Christoph Paulik
2016-04-18 7:44 ` Andrew Ardill
2016-04-18 16:36 ` Junio C Hamano
2016-04-18 16:54 ` Junio C Hamano
2016-04-26 21:32 ` [PATCH 1/2] merge: do not contaminate option_commit with --squash Junio C Hamano
2016-04-27 6:46 ` Johannes Schindelin
2016-04-27 15:14 ` Junio C Hamano
2016-04-27 15:19 ` Johannes Schindelin
2016-04-26 21:37 ` [PATCH 2/2] merge: warn --no-commit merge when no new commit is created Junio C Hamano
2016-04-26 21:53 ` Stefan Beller [this message]
2016-04-26 22:00 ` Junio C Hamano
2016-04-27 1:39 ` Eric Sunshine
2016-04-27 5:57 ` Johannes Sixt
2016-04-27 6:50 ` Johannes Schindelin
2016-04-27 15:13 ` Junio C Hamano
2016-04-27 15:37 ` Johannes Schindelin
2016-04-27 16:02 ` Junio C Hamano
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='CAGZ79ka-HbB=oCidTtKSa32R9kqd2_c-cG8h+ttAVy=a8UfgFQ@mail.gmail.com' \
--to=sbeller@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=andrew.ardill@gmail.com \
--cc=cpaulik@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.