From: Jonathan Nieder <jrnieder@gmail.com>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
git@vger.kernel.org, Christian Couder <chriscool@tuxfamily.org>,
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>,
Jay Soffian <jaysoffian@gmail.com>
Subject: [PATCH 6/7] Revert "reset: Make reset remove the sequencer state"
Date: Sat, 10 Dec 2011 07:03:48 -0600 [thread overview]
Message-ID: <20111210130348.GG22035@elie.hsd1.il.comcast.net> (raw)
In-Reply-To: <20111210124644.GA22035@elie.hsd1.il.comcast.net>
This reverts commit 95eb88d8ee588d89b4f06d2753ed4d16ab13b39f, which
was a UI experiment that did not reflect how "git reset" actually gets
used. The reversion also fixes a test, indicated in the patch.
Encouraged-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
branch.c | 2 -
t/t3510-cherry-pick-sequence.sh | 2 +-
t/t7106-reset-sequence.sh | 52 ---------------------------------------
3 files changed, 1 insertions(+), 55 deletions(-)
delete mode 100755 t/t7106-reset-sequence.sh
diff --git a/branch.c b/branch.c
index 025a97be..a6b6722e 100644
--- a/branch.c
+++ b/branch.c
@@ -3,7 +3,6 @@
#include "refs.h"
#include "remote.h"
#include "commit.h"
-#include "sequencer.h"
struct tracking {
struct refspec spec;
@@ -247,5 +246,4 @@ void remove_branch_state(void)
unlink(git_path("MERGE_MSG"));
unlink(git_path("MERGE_MODE"));
unlink(git_path("SQUASH_MSG"));
- remove_sequencer_state(0);
}
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 851b147f..e80050e1 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -353,7 +353,7 @@ test_expect_success '--continue asks for help after resolving patch to nil' '
test_i18ngrep "The previous cherry-pick is now empty" msg
'
-test_expect_failure 'follow advice and skip nil patch' '
+test_expect_success 'follow advice and skip nil patch' '
pristine_detach conflicting &&
test_must_fail git cherry-pick initial..picked &&
diff --git a/t/t7106-reset-sequence.sh b/t/t7106-reset-sequence.sh
deleted file mode 100755
index 83f7ea59..00000000
--- a/t/t7106-reset-sequence.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-test_description='Test interaction of reset --hard with sequencer
-
- + anotherpick: rewrites foo to d
- + picked: rewrites foo to c
- + unrelatedpick: rewrites unrelated to reallyunrelated
- + base: rewrites foo to b
- + initial: writes foo as a, unrelated as unrelated
-'
-
-. ./test-lib.sh
-
-pristine_detach () {
- git cherry-pick --quit &&
- git checkout -f "$1^0" &&
- git read-tree -u --reset HEAD &&
- git clean -d -f -f -q -x
-}
-
-test_expect_success setup '
- echo unrelated >unrelated &&
- git add unrelated &&
- test_commit initial foo a &&
- test_commit base foo b &&
- test_commit unrelatedpick unrelated reallyunrelated &&
- test_commit picked foo c &&
- test_commit anotherpick foo d &&
- git config advice.detachedhead false
-
-'
-
-test_expect_success 'reset --hard cleans up sequencer state, providing one-level undo' '
- pristine_detach initial &&
- test_must_fail git cherry-pick base..anotherpick &&
- test_path_is_dir .git/sequencer &&
- git reset --hard &&
- test_path_is_missing .git/sequencer &&
- test_path_is_dir .git/sequencer-old &&
- git reset --hard &&
- test_path_is_missing .git/sequencer-old
-'
-
-test_expect_success 'cherry-pick --abort does not leave sequencer-old dir' '
- pristine_detach initial &&
- test_must_fail git cherry-pick base..anotherpick &&
- git cherry-pick --abort &&
- test_path_is_missing .git/sequencer &&
- test_path_is_missing .git/sequencer-old
-'
-
-test_done
--
1.7.8.rc3
next prev parent reply other threads:[~2011-12-10 13:03 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-20 7:30 cherry-pick/revert error messages Jonathan Nieder
2011-11-20 8:02 ` Ramkumar Ramachandra
2011-11-20 9:46 ` [RFC/PATCH 0/3] " Jonathan Nieder
2011-11-20 9:48 ` [PATCH 1/3] revert: rename --reset option to --quit Jonathan Nieder
2011-11-21 20:36 ` Junio C Hamano
2011-11-21 22:35 ` Jakub Narebski
2011-11-21 22:43 ` Jonathan Nieder
2011-11-20 9:50 ` [PATCH 2/3] revert: rearrange pick_revisions() for clarity Jonathan Nieder
2011-11-20 9:51 ` [PATCH 3/3] revert: improve error message for cherry-pick during cherry-pick Jonathan Nieder
2011-11-22 11:12 ` [PATCH v2 0/3] Re: cherry-pick/revert error messages Jonathan Nieder
2011-11-22 11:14 ` [PATCH 1/3] revert: rename --reset option to --quit Jonathan Nieder
2011-11-22 11:15 ` [PATCH 2/3] revert: rearrange pick_revisions() for clarity Jonathan Nieder
2011-11-22 11:15 ` [PATCH 3/3] revert: improve error message for cherry-pick during cherry-pick Jonathan Nieder
2011-11-22 11:17 ` [PATCH 4/3] revert: write REVERT_HEAD pseudoref during conflicted revert Jonathan Nieder
2011-11-22 21:40 ` Thiago Farina
2011-12-01 9:34 ` Ramkumar Ramachandra
2011-11-22 11:20 ` [PATCH 5/3] revert: introduce --abort to cancel a failed cherry-pick Jonathan Nieder
2011-11-23 0:43 ` Junio C Hamano
2011-11-23 1:27 ` Jonathan Nieder
2011-11-23 8:49 ` [PATCH] Fix revert --abort on Windows Johannes Sixt
2011-11-23 10:04 ` Jonathan Nieder
2011-11-23 10:21 ` Johannes Sixt
2011-12-10 12:46 ` [RFC/PATCH 0/7] some sequencer loose ends (Re: Fix revert --abort on Windows) Jonathan Nieder
2011-12-10 12:47 ` [PATCH 1/7] revert: give --continue handling its own function Jonathan Nieder
2011-12-14 13:16 ` Ramkumar Ramachandra
2011-12-10 12:49 ` [PATCH 2/7] revert: allow cherry-pick --continue to commit before resuming Jonathan Nieder
2011-12-14 14:26 ` Ramkumar Ramachandra
2011-12-14 16:48 ` Jonathan Nieder
2011-12-10 12:58 ` [PATCH 3/7] revert: pass around rev-list args in already-parsed form Jonathan Nieder
2011-12-14 14:51 ` Ramkumar Ramachandra
2011-12-10 12:59 ` [PATCH 4/7] revert: allow single-pick in the middle of cherry-pick sequence Jonathan Nieder
2011-12-14 15:48 ` Ramkumar Ramachandra
2011-12-14 16:21 ` Jonathan Nieder
2012-04-05 11:49 ` Ævar Arnfjörð Bjarmason
2012-04-05 12:15 ` Jonathan Nieder
2011-12-10 13:02 ` [PATCH 5/7] revert: do not remove state until sequence is finished Jonathan Nieder
2011-12-14 16:02 ` Ramkumar Ramachandra
2011-12-10 13:03 ` Jonathan Nieder [this message]
2011-12-14 16:06 ` [PATCH 6/7] Revert "reset: Make reset remove the sequencer state" Ramkumar Ramachandra
2011-12-10 13:06 ` [PATCH 7/7] revert: stop creating and removing sequencer-old directory Jonathan Nieder
2011-12-14 16:10 ` Ramkumar Ramachandra
2011-12-11 19:58 ` [RFC/PATCH 0/7] some sequencer loose ends (Re: Fix revert --abort on Windows) Jonathan Nieder
2011-12-12 8:15 ` Junio C Hamano
2011-12-12 21:31 ` Junio C Hamano
2011-12-14 9:57 ` Jonathan Nieder
2011-11-23 17:23 ` [PATCH] Fix revert --abort on Windows Alex Riesen
2011-11-30 22:52 ` [PATCH 5/3] revert: introduce --abort to cancel a failed cherry-pick Junio C Hamano
2011-11-22 11:20 ` [PATCH 6/3] revert: remove --reset compatibility option Jonathan Nieder
2011-11-22 21:49 ` Junio C Hamano
2011-11-22 23:11 ` Jonathan Nieder
2011-11-22 23:38 ` Junio C Hamano
2011-11-22 11:27 ` [PATCH v2 0/3] Re: cherry-pick/revert error messages Jonathan Nieder
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=20111210130348.GG22035@elie.hsd1.il.comcast.net \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jaysoffian@gmail.com \
--cc=martin.von.zweigbergk@gmail.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).