Re: [PATCH 5/3] revert: introduce --abort to cancel a failed cherry-pick
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:31
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 5/3] revert: introduce --abort to cancel a failed cherry-pick · Junio C Hamano <hidden>
- 2016-06-15 · [PATCH 5/3] revert: introduce --abort to cancel a failed cherry-pick · Jonathan Nieder <hidden>
Jonathan Nieder [off-list ref] writes:
quoted hunk
After running some ill-advised command like "git cherry-pick HEAD..linux-next", the bewildered novice may want to return to more familiar territory. Introduce a "git cherry-pick --abort" command that rolls back the entire cherry-pick sequence and places the repository back on solid ground. Just like "git merge --abort", this internally uses "git reset --merge", so local changes not involved in the conflict resolution are preserved. Signed-off-by: Jonathan Nieder <redacted> --- ...@@ -168,6 +265,7 @@ test_expect_success '--continue continues after conflicts are resolved' ' OBJID :100644 100644 OBJID OBJID M unrelated OBJID + :000000 100644 OBJID OBJID A bar :000000 100644 OBJID OBJID A foo :000000 100644 OBJID OBJID A unrelated EOF
What is this hunk about? Don't you also need another one to the test after that one? When merged with rr/revert-cherry-pick series, t3510 seems to misbehave around this area.