From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Nanako Shiraishi <nanako3@lavabit.com>,
Brian Lopez <brian@github.com>
Subject: Re: [RFC/PATCH 2/2] stash: drop dirty worktree check on apply
Date: Tue, 05 Apr 2011 14:59:36 -0700 [thread overview]
Message-ID: <7vvcysl5pz.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20110405212314.GA3613@sigill.intra.peff.net> (Jeff King's message of "Tue, 5 Apr 2011 17:23:15 -0400")
Jeff King <peff@peff.net> writes:
> However, this check has two problems:
>
> 1. It is overly restrictive. If my stash changes only file
> "foo", but "bar" is dirty in the working tree, it will
> prevent us from applying the stash.
>
> 2. It is redundant. We don't touch the working tree at all
> until we actually call merge-recursive. But it has its
> own (much more accurate) checks to avoid losing working
> tree data, and will abort the merge with a nicer
> message telling us which paths were problems.
I _think_ the reason we originally insisted on clean working tree was that
while merge-resolve has always had an acurate check, merge-recursive's
check was not very good, especially when renames are involved. So
probably this part of your comment ...
> I'm not sure if the check was perhaps even required when git-stash was
> written, and has simply since become useless as merge-recursive became
> more careful.
... may need to be used to rewrite bullet 2. above.
This is a tangent, but I notice that the additional bolted-on codepath for
the --index option has this:
git diff-tree --binary $s^2^..$s^2 | git apply --cached
It might want to do -B -M to match what "git merge-recursive" does.
next prev parent reply other threads:[~2011-04-05 21:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-05 21:20 [PATCH 1/2] stash: fix accidental apply of non-existent stashes Jeff King
2011-04-05 21:23 ` [RFC/PATCH 2/2] stash: drop dirty worktree check on apply Jeff King
2011-04-05 21:59 ` Junio C Hamano [this message]
2011-04-05 22:18 ` Jeff King
2011-04-05 22:50 ` Jeff King
2011-04-05 23:02 ` Jeff King
2011-04-05 23:17 ` Junio C Hamano
2011-04-06 23:01 ` Junio C Hamano
2011-04-05 23:23 ` [PATCH 1/2] stash: fix accidental apply of non-existent stashes Jon Seymour
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=7vvcysl5pz.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=brian@github.com \
--cc=git@vger.kernel.org \
--cc=nanako3@lavabit.com \
--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).