git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH 2/4] commit: introduce a config key to allow as-is commit with i-t-a entries
Date: Mon, 6 Feb 2012 18:59:43 -0600	[thread overview]
Message-ID: <20120207005943.GA2149@burratino> (raw)
In-Reply-To: <CACsJy8Be=WLv1Zz5CqQMYfi8dJN6M980kVuckAQKAujVo8xFkQ@mail.gmail.com>

Nguyen Thai Ngoc Duy wrote:
> 2012/2/7 Junio C Hamano <gitster@pobox.com>:

>>> +                     if (i < active_nr)
>>> +                             warning(_("You are committing as-is with intent-to-add entries as the result of\n"
>>> +                                       "\"git add -N\". Git currently forbids this case.
>>
>> Can we phrase this a bit better?
>>
>> It is not like "forbids", but is "giving up because you didn't tell me
>> what content to include in the commit, even though you said you will tell
>> me later".
>
> "rejects"? I would rather say "see `git add -N` man page for more
> explanation" than putting it here. The warning is quite long as it is
> right now.

If I ruled the world, it would say something like this:

	error: you intended to add "foo.c" but did not add it; not committing
	hint: to commit all changes to tracked files, use "commit -a"
	hint: to commit without adding "foo.c", use "commit --ignore-intent-to-add", which may become the default in future versions of git

But without the long line. ;-)

  reply	other threads:[~2012-02-07  0:59 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-06 10:57 [PATCH 0/4] Deprecate "not allow as-is commit with i-t-a entries" Nguyễn Thái Ngọc Duy
2012-02-06 10:57 ` [PATCH 1/4] cache-tree: update API to take abitrary flags Nguyễn Thái Ngọc Duy
2012-02-06 19:51   ` Junio C Hamano
2012-02-06 10:57 ` [PATCH 2/4] commit: introduce a config key to allow as-is commit with i-t-a entries Nguyễn Thái Ngọc Duy
2012-02-06 19:50   ` Junio C Hamano
2012-02-07  0:43     ` Nguyen Thai Ngoc Duy
2012-02-07  0:59       ` Jonathan Nieder [this message]
2012-02-06 21:10   ` Junio C Hamano
2012-02-06 21:13     ` Jonathan Nieder
2012-02-06 21:48       ` Junio C Hamano
2012-02-07  0:58     ` Nguyen Thai Ngoc Duy
2012-02-07  1:13       ` Junio C Hamano
2012-02-07  6:10     ` Junio C Hamano
2012-02-07  6:26       ` Nguyen Thai Ngoc Duy
2012-02-07  7:57         ` Junio C Hamano
2012-02-06 10:57 ` [PATCH 3/4] commit: turn commit.ignoreIntentToAdd to true by default Nguyễn Thái Ngọc Duy
2012-02-06 20:03   ` Junio C Hamano
2012-02-07  1:03     ` Nguyen Thai Ngoc Duy
2012-02-06 10:57 ` [PATCH 4/4] commit: remove commit.ignoreIntentToAdd, assume it's always true Nguyễn Thái Ngọc Duy
2012-02-06 20:05   ` 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=20120207005943.GA2149@burratino \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@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).