git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [RFC PATCH] am: do not do any reset on --abort
Date: Mon, 25 May 2009 06:43:09 -0400	[thread overview]
Message-ID: <20090525104308.GA26775@coredump.intra.peff.net> (raw)
In-Reply-To: <20090508091218.GC29737@coredump.intra.peff.net>

We really have no idea what state the tree is in at this
point, and whether the user might have done useful work on
top of it. So let's err on the side of keeping the user's
data intact.

The downside is that if they do have cruft to get rid of, or
want to pretend as if earlier parts of the series that were
applied did not exist, they must manually "git reset --hard"
now.

Signed-off-by: Jeff King <peff@peff.net>
---
This is a followup to:

  http://thread.gmane.org/gmane.comp.version-control.git/118373

 git-am.sh |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/git-am.sh b/git-am.sh
index 578780b..a7e24cf 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -240,10 +240,6 @@ then
 			exec git rebase --abort
 		fi
 		git rerere clear
-		test -f "$dotest/dirtyindex" || {
-			git read-tree --reset -u HEAD ORIG_HEAD
-			git reset ORIG_HEAD
-		}
 		rm -fr "$dotest"
 		exit ;;
 	esac
-- 
1.6.3.1.250.g01b8b.dirty

  reply	other threads:[~2009-05-25 10:43 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-06 19:19 Bug: 'git am --abort' can silently reset the wrong branch Eduardo Habkost
2009-05-08  8:28 ` Jeff King
2009-05-08  8:37   ` Sverre Rabbelier
2009-05-08  9:01   ` Junio C Hamano
2009-05-08  9:12     ` Jeff King
2009-05-25 10:43       ` Jeff King [this message]
2009-05-25 11:49         ` [RFC PATCH] am: do not do any reset on --abort Johannes Schindelin
2009-05-25 12:00           ` Jeff King
2009-05-25 12:17             ` Johannes Sixt
2009-05-25 15:54               ` Avery Pennarun
2009-05-25 16:00                 ` Jeff King
2009-05-25 16:02               ` Jeff King
2009-05-25 16:10                 ` Avery Pennarun
2009-05-25 22:23         ` Junio C Hamano

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=20090525104308.GA26775@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).