From: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, me@ikke.info
Subject: Re: [PATCH] commit & merge: modularize the empty message validator
Date: Thu, 13 Jul 2017 18:30:37 +0530 [thread overview]
Message-ID: <1499950837.2427.1.camel@gmail.com> (raw)
In-Reply-To: <xmqq8tju3eqp.fsf@gitster.mtv.corp.google.com>
On Tue, 2017-07-11 at 13:22 -0700, Junio C Hamano wrote:
> Having said all that, I am not sure "Prevent such surprises" is a
> problem that is realistic to begin with. When a user sees the
> editor buffer in "git merge", it is pre-populated with at least a
> single line of message "Merge branch 'foo'", possibly followed by
> the summary the side branch being merged, so unless the user
> deliberately removes everything and then add a sign-off line
> (because we do not usually add one), there is no room for "such
> surprises" in the first place. It does not _hurt_ to diagnose such
> a crazy case, but it feels a bit lower priority.
>
It's little unfortunate that I haven't mentioned the reason I asked the
question that has resulted in this patch. It would explain a little
about why I thought this wasn't "meh" (I hope it stands for "who care
what ever").
Sometimes I abort an commit from from the editor by providing an empty
commit message. Then I came to know that 'git commit' considers commit
messages with just signed-off-by lines as an empty message. I tried to
take advantage of that. I once tried to abort a merge by just removing
the "Merge ..." line and leaving the "Signed-off" line and was
surprised to see the merge happen instead of an abort. The rest is
history. :)
--
Kaartic
next prev parent reply other threads:[~2017-07-13 13:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-02 12:03 Why doesn't merge fail if message has only sign-off? Kaartic Sivaraam
2017-07-03 17:21 ` Junio C Hamano
2017-07-04 20:03 ` Kaartic Sivaraam
2017-07-06 3:31 ` [PATCH] merge-message: change meaning of "empty merge message" Kaartic Sivaraam
2017-07-06 4:46 ` Kevin Daudt
2017-07-06 12:20 ` Kaartic Sivaraam
2017-07-11 14:12 ` [PATCH] commit & merge: modularize the empty message validator Kaartic Sivaraam
2017-07-11 14:41 ` [PATCH/RFC] " Kaartic Sivaraam
2017-07-11 20:22 ` [PATCH] " Junio C Hamano
2017-07-13 13:00 ` Kaartic Sivaraam [this message]
2017-07-13 17:58 ` Junio C Hamano
2017-07-14 13:31 ` Kaartic Sivaraam
2017-07-17 9:08 ` Christian Brabandt
2017-07-17 17:16 ` Junio C Hamano
2017-07-13 18:15 ` Kaartic Sivaraam
2017-07-13 19:23 ` Junio C Hamano
2017-07-14 17:49 ` Kaartic Sivaraam
2017-07-15 8:33 ` Kaartic Sivaraam
2017-08-21 13:34 ` [PATCH v2] branch: change the error messages to be more meaningful Kaartic Sivaraam
2017-08-21 13:52 ` Kaartic Sivaraam
2017-08-21 14:05 ` [PATCH v2/RFC] commit: change the meaning of an empty commit message Kaartic Sivaraam
2017-08-24 20:19 ` Junio C Hamano
2017-08-31 13:36 ` Kaartic Sivaraam
2017-10-02 17:20 ` Kaartic Sivaraam
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1499950837.2427.1.camel@gmail.com \
--to=kaarticsivaraam91196@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ikke.info \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).