From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Josh Triplett <josh@joshtriplett.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Can't git stash after using git add -N
Date: Wed, 16 Mar 2016 17:18:33 -0400 [thread overview]
Message-ID: <20160316211833.GC2200@sigill.intra.peff.net> (raw)
In-Reply-To: <CAPc5daVnQ94jc8pP=-FUgRA7oS=vXNGG=5Z23NWuZZScnhkQ9g@mail.gmail.com>
On Wed, Mar 16, 2016 at 02:11:19PM -0700, Junio C Hamano wrote:
> I actually think "silently ignore intent-to-add" was a mistake.
> We used to error out at write-tree time, which I think is the
> right behaviour--"I know I want to have this path, but I cannot
> yet decide with what content" is what the user is telling us when
> she says "add -N", so until that indecision is resolved, we
> shouldn't write out a tree object out of the index.
Yeah, I am inclined to agree, and I _thought_ we also used to error out
during write-tree, but I failed to find the spot where we switched
(thinking that it might provide some rationale).
I think I just didn't look far enough back, though. Commit 3f6d56d
(commit: ignore intent-to-add entries instead of refusing, 2012-02-07)
does not exactly have a sneaky title.
-Peff
prev parent reply other threads:[~2016-03-16 21:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 23:07 Can't git stash after using git add -N Josh Triplett
2016-03-15 23:46 ` Junio C Hamano
2016-03-16 2:00 ` Josh Triplett
2016-03-16 4:51 ` Junio C Hamano
2016-03-16 11:09 ` Duy Nguyen
2016-03-16 12:02 ` Josh Triplett
2016-03-16 21:05 ` Jeff King
2016-03-16 21:11 ` Junio C Hamano
2016-03-16 21:18 ` Jeff King [this message]
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=20160316211833.GC2200@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=josh@joshtriplett.org \
/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).