git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@github.com>
Cc: git@vger.kernel.org, Brian Lopez <brian@github.com>
Subject: Re: [RFC/PATCH 2/2] stash: drop dirty worktree check on apply
Date: Tue, 05 Apr 2011 16:17:45 -0700	[thread overview]
Message-ID: <7v7hb8l23q.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20110405230245.GA7631@sigill.intra.peff.net> (Jeff King's message of "Tue, 5 Apr 2011 19:02:45 -0400")

Jeff King <peff@github.com> writes:

>   The same "robustness" comments for the save_work function apply
>   here.  You probably do not want to restore on a dirty tree; the
>   intended use case is "stash away, pull, then restore", so I
>   think it is Ok to assume that you will only be restoring on a
>   clean state (and it would make the implementation simpler).
>
> So perhaps there is no broken case at all, and it was just a matter of
> being overly conservative from the beginning.

Perhaps.

If we are going to treat this as another mergy operation, we should at
least still make sure that the index is clean (i.e. "diff --cached" is
empty), I think.

  reply	other threads:[~2011-04-05 23:18 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
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 [this message]
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=7v7hb8l23q.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=brian@github.com \
    --cc=git@vger.kernel.org \
    --cc=peff@github.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. 
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).