From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: Re: [PATCH 12/14] revert: Introduce --reset to cleanup sequencer data
Date: Wed, 6 Jul 2011 20:02:29 +0530 [thread overview]
Message-ID: <CALkWK0nhH=_3+Gj=O4Ov2zOGBoVquzD--+RW_QYYnb8YMAHniA@mail.gmail.com> (raw)
In-Reply-To: <1309938868-2028-13-git-send-email-artagnon@gmail.com>
Hi,
Ramkumar Ramachandra writes:
> builtin/revert.c | 54 ++++++++++++++++++++++++++++++-----
> git-rebase--interactive.sh | 25 +++++++++++++---
> t/t3032-merge-recursive-options.sh | 2 +
> t/t3501-revert-cherry-pick.sh | 1 +
> t/t3502-cherry-pick-merge.sh | 9 ++++-
> t/t3504-cherry-pick-rerere.sh | 2 +
> t/t3505-cherry-pick-empty.sh | 14 ++++-----
> t/t3506-cherry-pick-ff.sh | 3 ++
> t/t3507-cherry-pick-conflict.sh | 24 ++++++++++++---
> t/t3510-cherry-pick-sequence.sh | 14 +++++++++
> t/t7502-commit.sh | 1 +
> 11 files changed, 121 insertions(+), 28 deletions(-)
By making `reset --hard` blow away the sequencer state, and trying
hard not to modify existing scripts, the diffstat still contains these
files:
builtin/revert.c
git-rebase--interactive.sh
t/t3032-merge-recursive-options.sh
r/t3505-cherry-pick-empty.sh
r/t3507-cherry-pick-conflict.sh
r/t3501-cherry-pick-sequence.sh
> diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
> index 2b17311..81191ae 100755
> --- a/t/t3032-merge-recursive-options.sh
> +++ b/t/t3032-merge-recursive-options.sh
> @@ -113,8 +113,10 @@ test_expect_success '--ignore-space-change makes merge succeed' '
> test_expect_success 'naive cherry-pick fails' '
> git read-tree --reset -u HEAD &&
> test_must_fail git cherry-pick --no-commit remote &&
> + git cherry-pick --reset &&
> git read-tree --reset -u HEAD &&
> test_must_fail git cherry-pick remote &&
> + git cherry-pick --reset &&
> test_must_fail git update-index --refresh &&
> grep "<<<<<<" text.txt
> '
> diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
> index 595d2ff..e0c805d 100755
> --- a/t/t3501-revert-cherry-pick.sh
> +++ b/t/t3501-revert-cherry-pick.sh
> @@ -96,6 +96,7 @@ test_expect_success 'revert forbidden on dirty working tree' '
> echo content >extra_file &&
> git add extra_file &&
> test_must_fail git revert HEAD 2>errors &&
> + git revert --reset &&
> test_i18ngrep "Your local changes would be overwritten by " errors
>
> '
> diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh
> index c10b28c..dc02227 100755
> --- a/t/t3505-cherry-pick-empty.sh
> +++ b/t/t3505-cherry-pick-empty.sh
> @@ -23,10 +23,9 @@ test_expect_success setup '
> '
>
> test_expect_success 'cherry-pick an empty commit' '
> - git checkout master && {
> - git cherry-pick empty-branch^
> - test "$?" = 1
> - }
> + git checkout master &&
> + test_expect_code 1 git cherry-pick empty-branch^
> + git cherry-pick --reset
> '
>
> test_expect_success 'index lockfile was removed' '
> @@ -36,10 +35,9 @@ test_expect_success 'index lockfile was removed' '
> '
>
> test_expect_success 'cherry-pick a commit with an empty message' '
> - git checkout master && {
> - git cherry-pick empty-branch
> - test "$?" = 1
> - }
> + git checkout master &&
> + test_expect_code 1 git cherry-pick empty-branch &&
> + git cherry-pick --reset
> '
>
> test_expect_success 'index lockfile was removed' '
> diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
> index 212ec54..86f8626 100755
> --- a/t/t3507-cherry-pick-conflict.sh
> +++ b/t/t3507-cherry-pick-conflict.sh
> @@ -39,6 +39,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
>
> head=$(git rev-parse HEAD) &&
> test_must_fail git cherry-pick picked &&
> + git cherry-pick --reset &&
> newhead=$(git rev-parse HEAD) &&
>
> test "$head" = "$newhead"
> @@ -55,6 +56,7 @@ test_expect_success 'advice from failed cherry-pick' "
> hint: and commit the result with 'git commit'
> EOF
> test_must_fail git cherry-pick picked 2>actual &&
> + git cherry-pick --reset &&
>
> test_i18ncmp expected actual
> "
> @@ -62,7 +64,8 @@ test_expect_success 'advice from failed cherry-pick' "
> test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
> pristine_detach initial &&
> test_must_fail git cherry-pick picked &&
> - test_cmp_rev picked CHERRY_PICK_HEAD
> + test_cmp_rev picked CHERRY_PICK_HEAD &&
> + git cherry-pick --reset
> '
>
> test_expect_success 'successful cherry-pick does not set CHERRY_PICK_HEAD' '
> @@ -84,13 +87,15 @@ test_expect_success 'GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD' '
> export GIT_CHERRY_PICK_HELP &&
> test_must_fail git cherry-pick picked
> ) &&
> - test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
> + test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
> + git cherry-pick --reset
> '
>
> test_expect_success 'git reset clears CHERRY_PICK_HEAD' '
> pristine_detach initial &&
>
> test_must_fail git cherry-pick picked &&
> + git cherry-pick --reset &&
> git reset &&
>
> test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
> @@ -102,7 +107,8 @@ test_expect_success 'failed commit does not clear CHERRY_PICK_HEAD' '
> test_must_fail git cherry-pick picked &&
> test_must_fail git commit &&
>
> - test_cmp_rev picked CHERRY_PICK_HEAD
> + test_cmp_rev picked CHERRY_PICK_HEAD &&
> + git cherry-pick --reset
> '
>
> test_expect_success 'cancelled commit does not clear CHERRY_PICK_HEAD' '
> @@ -119,7 +125,8 @@ test_expect_success 'cancelled commit does not clear CHERRY_PICK_HEAD' '
> test_must_fail git commit
> ) &&
>
> - test_cmp_rev picked CHERRY_PICK_HEAD
> + test_cmp_rev picked CHERRY_PICK_HEAD &&
> + git cherry-pick --reset
> '
>
> test_expect_success 'successful commit clears CHERRY_PICK_HEAD' '
> @@ -130,13 +137,15 @@ test_expect_success 'successful commit clears CHERRY_PICK_HEAD' '
> git add foo &&
> git commit &&
>
> - test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
> + test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
> + git cherry-pick --reset
> '
>
> test_expect_success 'failed cherry-pick produces dirty index' '
> pristine_detach initial &&
>
> test_must_fail git cherry-pick picked &&
> + git cherry-pick --reset &&
>
> test_must_fail git update-index --refresh -q &&
> test_must_fail git diff-index --exit-code HEAD
> @@ -160,6 +169,7 @@ test_expect_success 'failed cherry-pick registers participants in index' '
> git read-tree -u --reset HEAD &&
>
> test_must_fail git cherry-pick picked &&
> + git cherry-pick --reset &&
> git ls-files --stage --unmerged > actual &&
>
> test_cmp expected actual
> @@ -176,6 +186,7 @@ test_expect_success 'failed cherry-pick describes conflict in work tree' '
> EOF
>
> test_must_fail git cherry-pick picked &&
> + git cherry-pick --reset &&
>
> sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
> test_cmp expected actual
> @@ -195,6 +206,7 @@ test_expect_success 'diff3 -m style' '
> EOF
>
> test_must_fail git cherry-pick picked &&
> + git cherry-pick --reset &&
>
> sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
> test_cmp expected actual
> @@ -227,6 +239,7 @@ test_expect_success 'revert also handles conflicts sanely' '
>
> head=$(git rev-parse HEAD) &&
> test_must_fail git revert picked &&
> + git revert --reset &&
> newhead=$(git rev-parse HEAD) &&
> git ls-files --stage --unmerged > actual-stages &&
>
> @@ -252,6 +265,7 @@ test_expect_success 'revert conflict, diff3 -m style' '
> EOF
>
> test_must_fail git revert picked &&
> + git revert --reset &&
>
> sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
> test_cmp expected actual
As you can see, there is no "reset --hard" in these, and I don't see
what other command I can piggy-bank on to blow away the sequencer
state. There is however, one other thing I can do: if there is
nothing left to cherry-pick after a successful conflict resolution +
git commit, I can modify commit.c to blow away the sequencer state
after checking appropriately. This will also have a nice end-user
experience side-effect:
$ git cherry-pick moo
fatal: Conflict in foo!
$ echo "Resolved" > foo
$ git add moo
$ git commit
$ git cherry-pick --continue # This no-op will be unnecessary
Then again, teaching commit about the sequencer is inelegant, and it's
possible to achieve this effect in another way: when a conflict is
encountered in the sequencer && length(todo_file) == 1, throw away the
sequencer state. When I say "throw away", I really mean "move
.git/sequencer to .git/sequencer-old". Does this seem reasonable?
-- Ram
next prev parent reply other threads:[~2011-07-06 14:32 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-06 7:54 [GSoC update] Sequencer: The insn sheet format Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 01/14] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-07-06 8:35 ` Jonathan Nieder
2011-07-06 9:28 ` Ramkumar Ramachandra
2011-07-06 10:03 ` Jonathan Nieder
2011-07-06 7:54 ` [PATCH 02/14] revert: Inline add_message_to_msg function Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 03/14] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 04/14] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 05/14] revert: Propogate errors upwards from do_pick_commit Ramkumar Ramachandra
2011-07-06 8:50 ` Jonathan Nieder
2011-07-06 9:30 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 06/14] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-07-06 8:55 ` Jonathan Nieder
2011-07-06 9:37 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 07/14] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-07-06 9:09 ` Jonathan Nieder
2011-07-06 11:20 ` Ramkumar Ramachandra
2011-07-06 12:06 ` Jonathan Nieder
2011-07-12 6:14 ` Ramkumar Ramachandra
2011-07-06 21:20 ` Junio C Hamano
2011-07-12 6:21 ` Ramkumar Ramachandra
2011-07-12 6:33 ` Jonathan Nieder
2011-07-06 7:54 ` [PATCH 08/14] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-07-06 9:13 ` Jonathan Nieder
2011-07-06 9:34 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 09/14] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-07-06 9:20 ` Jonathan Nieder
2011-07-06 7:54 ` [PATCH 10/14] revert: Persist data for continuation Ramkumar Ramachandra
2011-07-06 10:01 ` Jonathan Nieder
2011-07-06 11:55 ` Ramkumar Ramachandra
2011-07-06 21:20 ` Junio C Hamano
2011-07-06 7:54 ` [PATCH 11/14] revert: Introduce a layer of indirection over pick_commits Ramkumar Ramachandra
2011-07-06 10:37 ` Jonathan Nieder
2011-07-06 11:24 ` Ramkumar Ramachandra
2011-07-06 11:39 ` Jonathan Nieder
2011-07-06 11:44 ` Ramkumar Ramachandra
2011-07-06 11:53 ` Jonathan Nieder
2011-07-06 21:00 ` Junio C Hamano
2011-07-07 6:31 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 12/14] revert: Introduce --reset to cleanup sequencer data Ramkumar Ramachandra
2011-07-06 10:14 ` Jonathan Nieder
2011-07-06 10:55 ` Ramkumar Ramachandra
2011-07-06 14:32 ` Ramkumar Ramachandra [this message]
2011-07-06 19:21 ` Jonathan Nieder
2011-07-06 19:56 ` Jonathan Nieder
2011-07-07 3:03 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [PATCH 13/14] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-07-06 10:25 ` Jonathan Nieder
2011-07-06 21:21 ` Junio C Hamano
2011-07-06 21:52 ` Drew Northup
2011-07-07 6:35 ` Ramkumar Ramachandra
2011-07-06 7:54 ` [RFC PATCH 14/14] revert: Change insn sheet format Ramkumar Ramachandra
2011-07-06 10:33 ` Jonathan Nieder
2011-07-06 10:49 ` Ramkumar Ramachandra
2011-07-06 10:41 ` [GSoC update] Sequencer: The " 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='CALkWK0nhH=_3+Gj=O4Ov2zOGBoVquzD--+RW_QYYnb8YMAHniA@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 \
/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).