git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Daniel Vicarel <shundra8820@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Why does "merge --continue" expect no arguments?
Date: Tue, 21 Dec 2021 22:20:34 -0800	[thread overview]
Message-ID: <xmqqpmppkvnx.fsf@gitster.g> (raw)
In-Reply-To: <CALRdAffjmvHao8TRfB9YJez1acwHDAq2ZqiqaCRRr5MaWzhxig@mail.gmail.com> (Daniel Vicarel's message of "Tue, 21 Dec 2021 12:51:19 -0500")

Daniel Vicarel <shundra8820@gmail.com> writes:

> Fair point. I would argue that in my own personal projects, where I am
> the only contributor, sometimes I just want to accept the default
> merge message and move on.  However, one could apply that reasoning to
> _every_ commit message in a personal project, and I certainly don't
> believe in that... so yeah, you've given me something to think about.

Like everybody else, I've had my fair share of "personal projects"
that I was the only developer who lost interest in them in 6 months
to 2 years since their inception---after that nobody would care, and
in such projects, of course, I can remember what I was thinking when
I did some nonsensical change early in their history.  I can survive
sloppy and crappy messages.

But in other projects, I've learned that the author of a commit or a
merge with my name and e-mail address 6 months ago often is a total
stranger for me sitting in front of the display right now.

> I agree that some clearer documentation around `merge --continue` is
> worthwhile, to prevent other developers from thinking like myself.
> Maybe a warning from the CLI after running `merge --continue`,
> recommending `commit` usage instead? Such a warning suggests that the
> option _should_ still be deprecated and removed in the future though.
>
> I am still interested in making a contribution to git, so let me know
> which option you would like me to move forward with at this time:
> adding the CLI warning, or going straight to a deprecation. Unless of
> course you're already on it. :)

Welcome to the development community.

If you want a starter project, among those I listed, perhaps the doc
update would be the quickest one that offers the most to learn from,
as the first road block new developers seem to stumble on is not
coding standard and stuff but social interaction between the patch
submitter and reviewers.

Allowing some selected command line option given to "git merge
--continue" down to underlying "git commit" would be a lot harder
for somebody new to the codebase.  It might make sense to allow
things like "--no-edit" and "--no-verify" to be passed, but you
would never ever want to pass something like "--amend", or (even
worse) a pathspec.  And coming up with a sensible list of allowed
options and arguments would be quite hard.


  parent reply	other threads:[~2021-12-22  6:20 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-21 14:50 Why does "merge --continue" expect no arguments? Daniel Vicarel
2021-12-21 17:13 ` Junio C Hamano
2021-12-21 17:51   ` Daniel Vicarel
2021-12-21 17:54     ` Daniel Vicarel
2021-12-22  6:20     ` Junio C Hamano [this message]
2021-12-21 17:57   ` Philip Oakley
2021-12-24 17:08   ` Ævar Arnfjörð Bjarmason
2021-12-25  2:01     ` Junio C Hamano
2021-12-26 23:31       ` Ævar Arnfjörð Bjarmason
2021-12-27 19:29         ` Junio C Hamano
     [not found] ` <CAFOYHZC0r35mfOVUExHsBP5=URKFAt_wDTZ51pTc=XkXyogqKQ@mail.gmail.com>
2021-12-23  6:07   ` Daniel Vicarel
2021-12-23 18:35     ` 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=xmqqpmppkvnx.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=shundra8820@gmail.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).