From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>,
Jonathan Nieder <jrnieder@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH 17/18] revert: Introduce --continue to continue the operation
Date: Tue, 2 Aug 2011 00:01:03 +0530 [thread overview]
Message-ID: <CALkWK0npaR+FESUEBUJv_pyL1prshBBy9MifOn6UUG8rDOJnXQ@mail.gmail.com> (raw)
In-Reply-To: <1312222025-28453-18-git-send-email-artagnon@gmail.com>
Hi again,
Ramkumar Ramachandra writes:
> +test_expect_success 'malformed instruction sheet 1' '
> + pristine_detach initial &&
> + test_must_fail git cherry-pick base..anotherpick &&
> + echo "resolved" >foo &&
> + git add foo &&
> + git commit &&
> + sed "s/pick /pick/" .git/sequencer/todo >new_sheet
> + cp new_sheet .git/sequencer/todo
> + test_must_fail git cherry-pick --continue
> +'
Ugh. I forgot to chain using '&&' .
> +test_expect_success 'malformed instruction sheet 2' '
> + pristine_detach initial &&
> + test_must_fail git cherry-pick base..anotherpick &&
> + echo "resolved" >foo &&
> + git add foo &&
> + git commit &&
> + sed "s/pick/revert/" .git/sequencer/todo >new_sheet
> + cp new_sheet .git/sequencer/todo
> + test_must_fail git cherry-pick --continue
> +'
Here too.
Please squash this in while reading -- thanks :)
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 457ad76..626136a 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -195,8 +195,8 @@ test_expect_success 'malformed instruction sheet 1' '
echo "resolved" >foo &&
git add foo &&
git commit &&
- sed "s/pick /pick/" .git/sequencer/todo >new_sheet
- cp new_sheet .git/sequencer/todo
+ sed "s/pick /pick/" .git/sequencer/todo >new_sheet &&
+ cp new_sheet .git/sequencer/todo &&
test_must_fail git cherry-pick --continue
'
@@ -206,8 +206,8 @@ test_expect_success 'malformed instruction sheet 2' '
echo "resolved" >foo &&
git add foo &&
git commit &&
- sed "s/pick/revert/" .git/sequencer/todo >new_sheet
- cp new_sheet .git/sequencer/todo
+ sed "s/pick/revert/" .git/sequencer/todo >new_sheet &&
+ cp new_sheet .git/sequencer/todo &&
test_must_fail git cherry-pick --continue
'
-- Ram
next prev parent reply other threads:[~2011-08-01 18:31 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-01 18:06 [PATCH v5 00/18] Sequencer for inclusion Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 03/18] revert: Simplify and inline add_message_to_msg Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 04/18] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 05/18] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 06/18] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 07/18] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 08/18] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 09/18] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-08-02 6:28 ` Christian Couder
2011-08-02 6:41 ` Christian Couder
2011-08-04 9:34 ` Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 10/18] revert: Save data for continuing after conflict resolution Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 11/18] revert: Save command-line options for continuing operation Ramkumar Ramachandra
2011-08-04 4:05 ` Christian Couder
2011-08-04 9:25 ` Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 12/18] revert: Make pick_commits functionally act on a commit list Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 13/18] revert: Introduce --reset to remove sequencer state Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 14/18] reset: Make reset remove the " Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 15/18] revert: Remove sequencer state when no commits are pending Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 16/18] revert: Don't implicitly stomp pending sequencer operation Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 17/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-08-01 18:31 ` Ramkumar Ramachandra [this message]
2011-08-02 2:36 ` Christian Couder
2011-08-02 2:47 ` Christian Couder
2011-08-02 2:51 ` Christian Couder
2011-08-02 4:41 ` Ramkumar Ramachandra
2011-08-04 10:02 ` Ramkumar Ramachandra
2011-08-02 6:24 ` Christian Couder
2011-08-04 4:57 ` Christian Couder
2011-08-04 9:22 ` Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 18/18] revert: Propagate errors upwards from do_pick_commit Ramkumar Ramachandra
-- strict thread matches above, loose matches on Subject: below --
2011-08-04 10:38 [PATCH 00/18] Sequencer for inclusion v6 Ramkumar Ramachandra
2011-08-04 10:39 ` [PATCH 17/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-08-08 7:31 ` Christian Couder
2011-08-08 8:24 ` Ramkumar Ramachandra
2011-08-08 16:28 ` Junio C Hamano
2011-08-09 5:26 ` Ramkumar Ramachandra
2011-07-28 16:52 [PATCH 00/18] Sequencer for inclusion v4 Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 17/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-07-31 15:51 ` Christian Couder
2011-08-01 17:48 ` Ramkumar Ramachandra
2011-08-03 13:34 ` Jonathan Nieder
2011-08-03 17:30 ` Junio C Hamano
2011-08-03 17:59 ` Ramkumar Ramachandra
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=CALkWK0npaR+FESUEBUJv_pyL1prshBBy9MifOn6UUG8rDOJnXQ@mail.gmail.com \
--to=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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.
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).