From: Junio C Hamano Date: Sun, 30 Aug 2009 20:01:11 GMT Subject: Re: [BUG] git stash refuses to save after "add -N" Message-ID: <7v63c5f4vs.fsf@alter.siamese.dyndns.org> In-Reply-To: <20090830095509.GB30922@coredump.intra.peff.net> Jeff King writes: > On Sat, Aug 29, 2009 at 03:34:45PM -0700, Junio C Hamano wrote: > >> I am slightly in favor of leaving the things as they are, as the error >> message is quite clear. > > Hmm. Thinking about it a bit more, I think "add as empty content" is > probably the best. It scares me a little because it is losing > information during the stash, but consider it from the user's > perspective. > ... > And all of this while they are trying to quickly switch contexts to > whatever it was that caused them to stash in the first place. Ok, then probably the "how about" patch would be a part of the right solution. One thing I noticed was that while unstashing without --index, we add full contents to the index of new files. I think it is because back then when stash was written there was no other way, but now we have intent-to-add and a way to stash such an entry, I think we should add only the intent to add them in that codepath. Of course we will not do this when unstashing with --index.