From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Andreas Krey <a.krey@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH] commit: make --only --allow-empty work without paths
Date: Mon, 05 Dec 2016 12:52:00 -0800 [thread overview]
Message-ID: <xmqqd1h63xqn.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20161203043254.7ozjyucfn6uivnsh@sigill.intra.peff.net> (Jeff King's message of "Fri, 2 Dec 2016 23:32:55 -0500")
Jeff King <peff@peff.net> writes:
> On Fri, Dec 02, 2016 at 11:15:13PM +0100, Andreas Krey wrote:
>
>> --only is implied when paths are present, and required
>> them unless --amend. But with --allow-empty it should
>> be allowed as well - it is the only way to create an
>> empty commit in the presence of staged changes.
>
> OK. I'm not sure why you would want to create an empty commit in such a
> case. But I do agree that this seems like a natural outcome for "--only
> --allow-empty". So whether it is particularly useful or not, it seems
> like the right thing to do. The patch itself looks good to me.
Slightly related topic.
>> - if (argc == 0 && (also || (only && !amend)))
>> + if (argc == 0 && (also || (only && !amend && !allow_empty)))
>> die(_("No paths with --include/--only does not make sense."));
>> if (argc == 0 && only && amend)
>> only_include_assumed = _("Clever... amending the last one with dirty index.");
>
We allow "-o --amend" without no pathspec because that is how you
would reword without changing the tree object in the tip commit, and
we reward the user who figured out such an esoteric use with a
message "Clever...". I do not think if people who say "I want to
create an empty commit but I already have added changes to the
index" deserve the same "Clever..." praise, so I will not suggest
adding another message above.
More seriously, I suspect that the message outlived its usefulness.
If we wanted to make the "use --amend -o without pathspec if you
want to reword the tip one without touching its tree" easier to
discover, the place to do so is in the documentation, not a message
that is given as a reward to those who already discovered it.
next prev parent reply other threads:[~2016-12-05 20:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 22:15 [PATCH] commit: make --only --allow-empty work without paths Andreas Krey
2016-12-03 4:32 ` Jeff King
2016-12-03 6:59 ` Andreas Krey
2016-12-03 16:23 ` Jeff King
2016-12-05 20:36 ` Junio C Hamano
2016-12-06 9:39 ` Andreas Krey
2016-12-05 20:52 ` Junio C Hamano [this message]
2016-12-08 13:50 ` [PATCH v2] " Andreas Krey
2016-12-08 16:47 ` Junio C Hamano
2016-12-09 4:10 ` [PATCH] commit: remove 'Clever' message for --only --amend Andreas Krey
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=xmqqd1h63xqn.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).