From: Jeff King <peff@peff.net>
To: Yann Dirson <ydirson@linagora.com>
Cc: git@vger.kernel.org
Subject: Re: [BUG] git stash refuses to save after "add -N"
Date: Fri, 28 Aug 2009 15:22:17 -0400 [thread overview]
Message-ID: <20090828192217.GA13023@coredump.intra.peff.net> (raw)
In-Reply-To: <20090828190531.GB11488@coredump.intra.peff.net>
On Fri, Aug 28, 2009 at 03:05:31PM -0400, Jeff King wrote:
> For the index case, we unfortunately cannot represent the situation in
> the index using a tree, which means we cannot have a stash that doesn't
> lose information. So we have to choose either dropping those index
> entries, inserting them as blank files, or inserting them with
> working-tree contents.
Actually, you _could_ try representing the information by shoe-horning
it into the tree. For example, by allocating a bit of the mode as
"intent-to-add". That seems pretty ugly to me, though.
You could also try to stick the information in the stash's commit
message and recreate it during "stash apply". But again, that feels kind
of ugly.
-Peff
next prev parent reply other threads:[~2009-08-28 19:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-28 11:02 [BUG] git stash refuses to save after "add -N" Yann Dirson
2009-08-28 19:05 ` Jeff King
2009-08-28 19:22 ` Jeff King [this message]
2009-08-29 22:34 ` Junio C Hamano
2009-08-30 9:55 ` Jeff King
2009-08-30 20:01 ` Junio C Hamano
2009-08-31 4:27 ` Jeff King
2009-08-31 5:03 ` Junio C Hamano
2009-08-31 5:05 ` Jeff King
2009-08-31 8:16 ` Yann Dirson
2009-08-31 4:36 ` Jeff King
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=20090828192217.GA13023@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=ydirson@linagora.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).