From: Phillip Wood <phillip.wood123@gmail.com>
To: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Cc: git@vger.kernel.org, newren@gmail.com, t.gummerer@gmail.com,
martin.agren@gmail.com, jrnieder@gmail.com
Subject: Re: [GSoC][PATCH v8 0/5] Teach cherry-pick/revert to skip commits
Date: Tue, 2 Jul 2019 16:26:27 +0100 [thread overview]
Message-ID: <64b16b96-8c87-8010-9355-2d13c55f9d2f@gmail.com> (raw)
In-Reply-To: <20190702091129.7531-1-rohit.ashiwal265@gmail.com>
Hi Rohit
Thanks for re-rolling again (and bearing with all the review rounds), I
think the range-diff looks good. These are ready for next as far as I'm
concerned.
Best Wishes
Phillip
On 02/07/2019 10:11, Rohit Ashiwal wrote:
> Another revision of my patch which takes care of all the nits.
>
> Rohit Ashiwal (5):
> sequencer: add advice for revert
> sequencer: rename reset_for_rollback to reset_merge
> sequencer: use argv_array in reset_merge
> cherry-pick/revert: add --skip option
> cherry-pick/revert: advise using --skip
>
> Documentation/config/advice.txt | 2 +
> Documentation/git-cherry-pick.txt | 4 +-
> Documentation/git-revert.txt | 4 +-
> Documentation/sequencer.txt | 4 +
> advice.c | 2 +
> advice.h | 1 +
> builtin/commit.c | 13 +--
> builtin/revert.c | 5 ++
> sequencer.c | 134 ++++++++++++++++++++++++++----
> sequencer.h | 1 +
> t/t3510-cherry-pick-sequence.sh | 122 +++++++++++++++++++++++++++
> 11 files changed, 266 insertions(+), 26 deletions(-)
>
> Range-diff:
> 1: 207042a895 < -: ---------- advice: add sequencerInUse config variable
> 2: d7c603d47f ! 1: 91d3949b69 sequencer: add advice for revert
> @@ -3,14 +3,58 @@
> sequencer: add advice for revert
>
> In the case of merge conflicts, while performing a revert, we are
> - currently advised to use `git cherry-pick --<sequencer-options>`
> - of which --continue is incompatible for continuing the revert.
> + currently advised to use `git cherry-pick --<sequencer-options>`.
> Introduce a separate advice message for `git revert`. Also change
> the signature of `create_seq_dir` to handle which advice to display
> selectively.
>
> Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
>
> + diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
> + --- a/Documentation/config/advice.txt
> + +++ b/Documentation/config/advice.txt
> +@@
> + resolveConflict::
> + Advice shown by various commands when conflicts
> + prevent the operation from being performed.
> ++ sequencerInUse::
> ++ Advice shown when a sequencer command is already in progress.
> + implicitIdentity::
> + Advice on how to set your identity configuration when
> + your information is guessed from the system username and
> +
> + diff --git a/advice.c b/advice.c
> + --- a/advice.c
> + +++ b/advice.c
> +@@
> + int advice_commit_before_merge = 1;
> + int advice_reset_quiet_warning = 1;
> + int advice_resolve_conflict = 1;
> ++int advice_sequencer_in_use = 1;
> + int advice_implicit_identity = 1;
> + int advice_detached_head = 1;
> + int advice_set_upstream_failure = 1;
> +@@
> + { "commitBeforeMerge", &advice_commit_before_merge },
> + { "resetQuiet", &advice_reset_quiet_warning },
> + { "resolveConflict", &advice_resolve_conflict },
> ++ { "sequencerInUse", &advice_sequencer_in_use },
> + { "implicitIdentity", &advice_implicit_identity },
> + { "detachedHead", &advice_detached_head },
> + { "setupStreamFailure", &advice_set_upstream_failure },
> +
> + diff --git a/advice.h b/advice.h
> + --- a/advice.h
> + +++ b/advice.h
> +@@
> + extern int advice_commit_before_merge;
> + extern int advice_reset_quiet_warning;
> + extern int advice_resolve_conflict;
> ++extern int advice_sequencer_in_use;
> + extern int advice_implicit_identity;
> + extern int advice_detached_head;
> + extern int advice_set_upstream_failure;
> +
> diff --git a/sequencer.c b/sequencer.c
> --- a/sequencer.c
> +++ b/sequencer.c
> 3: b70299c572 ! 2: 189ef90318 sequencer: rename reset_for_rollback to reset_merge
> @@ -6,7 +6,7 @@
> achieve this, we could really make use of existing functions.
> reset_for_rollback is one such function, but the name does not
> intuitively suggest to use it to reset a merge, which it was born to
> - perform see 539047c ("revert: introduce --abort to cancel a failed
> + perform, see 539047c ("revert: introduce --abort to cancel a failed
> cherry-pick", 2011-11-23). Change the name to reset_merge to make
> it more intuitive.
>
> 4: 569122c861 = 3: 2b237e3174 sequencer: use argv_array in reset_merge
> 5: 4580f0e5af = 4: 5d64faf501 cherry-pick/revert: add --skip option
> 6: f6f21b055b = 5: 807a344eb1 cherry-pick/revert: advise using --skip
>
prev parent reply other threads:[~2019-07-02 15:26 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-08 19:19 [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits Rohit Ashiwal
2019-06-08 19:19 ` [GSoC][PATCH 1/3] sequencer: add advice for revert Rohit Ashiwal
2019-06-09 17:52 ` Phillip Wood
2019-06-10 5:13 ` Rohit Ashiwal
2019-06-10 10:39 ` Phillip Wood
2019-06-10 13:25 ` Rohit Ashiwal
2019-06-10 17:46 ` Phillip Wood
2019-06-10 16:34 ` Junio C Hamano
2019-06-08 19:19 ` [GSoC][PATCH 2/3] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-09 8:37 ` Thomas Gummerer
2019-06-09 18:01 ` Phillip Wood
2019-06-10 5:57 ` Rohit Ashiwal
2019-06-10 10:40 ` Phillip Wood
2019-06-10 13:43 ` Rohit Ashiwal
2019-06-10 17:47 ` Phillip Wood
2019-06-08 19:19 ` [GSoC][PATCH 3/3] cherry-pick/revert: update hints Rohit Ashiwal
2019-06-09 8:42 ` Thomas Gummerer
2019-06-09 18:03 ` Phillip Wood
2019-06-10 5:28 ` Rohit Ashiwal
2019-06-10 10:40 ` Phillip Wood
2019-06-10 13:33 ` Rohit Ashiwal
2019-06-10 17:47 ` Phillip Wood
2019-06-09 9:02 ` [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits Thomas Gummerer
2019-06-09 10:06 ` Rohit Ashiwal
2019-06-09 20:00 ` Thomas Gummerer
2019-06-11 7:31 ` [GSoC][PATCH v2 " Rohit Ashiwal
2019-06-11 7:31 ` [GSoC][PATCH v2 1/3] sequencer: add advice for revert Rohit Ashiwal
2019-06-11 21:25 ` Junio C Hamano
2019-06-11 7:31 ` [GSoC][PATCH v2 2/3] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-12 13:31 ` Phillip Wood
2019-06-12 18:11 ` Junio C Hamano
2019-06-12 18:57 ` Phillip Wood
2019-06-11 7:31 ` [GSoC][PATCH v2 3/3] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-06-12 15:16 ` Phillip Wood
2019-06-13 4:05 ` [GSoC][PATCH v3 0/3] Teach cherry-pick/revert to skip commits Rohit Ashiwal
2019-06-13 4:05 ` [GSoC][PATCH v3 1/3] sequencer: add advice for revert Rohit Ashiwal
2019-06-13 17:45 ` Phillip Wood
2019-06-13 19:21 ` Martin Ågren
2019-06-13 20:59 ` Junio C Hamano
2019-06-14 3:44 ` Rohit Ashiwal
2019-06-14 3:43 ` Rohit Ashiwal
2019-06-13 4:05 ` [GSoC][PATCH v3 2/3] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-13 17:56 ` Junio C Hamano
2019-06-13 19:57 ` Junio C Hamano
2019-06-14 3:48 ` Rohit Ashiwal
2019-06-14 3:45 ` Rohit Ashiwal
2019-06-14 15:58 ` Junio C Hamano
2019-06-16 7:03 ` Rohit Ashiwal
2019-06-13 17:59 ` Phillip Wood
2019-06-13 4:05 ` [GSoC][PATCH v3 3/3] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-06-16 8:20 ` [GSoC][PATCH v4 0/4] [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits Rohit Ashiwal
2019-06-16 8:20 ` [GSoC][PATCH v4 1/4] sequencer: add advice for revert Rohit Ashiwal
2019-06-17 5:51 ` Thomas Gummerer
2019-06-16 8:20 ` [GSoC][PATCH v4 2/4] sequencer: rename reset_for_rollback to reset_merge Rohit Ashiwal
2019-06-16 8:20 ` [GSoC][PATCH v4 3/4] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-17 8:30 ` Thomas Gummerer
2019-06-16 8:20 ` [GSoC][PATCH v4 4/4] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-06-17 8:39 ` [GSoC][PATCH v4 0/4] [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits Thomas Gummerer
2019-06-18 17:06 ` [GSoC][PATCH v5 0/5] " Rohit Ashiwal
2019-06-18 17:06 ` [GSoC][PATCH v5 1/5] sequencer: add advice for revert Rohit Ashiwal
2019-06-18 17:06 ` [GSoC][PATCH v5 2/5] sequencer: rename reset_for_rollback to reset_merge Rohit Ashiwal
2019-06-18 17:06 ` [GSoC][PATCH v5 3/5] sequencer: use argv_array in reset_merge Rohit Ashiwal
2019-06-18 17:06 ` [GSoC][PATCH v5 4/5] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-20 3:40 ` Junio C Hamano
2019-06-20 9:46 ` Rohit Ashiwal
2019-06-20 9:57 ` Phillip Wood
2019-06-20 20:09 ` Junio C Hamano
2019-06-20 10:02 ` Phillip Wood
2019-06-20 10:34 ` Rohit Ashiwal
2019-06-20 11:42 ` Phillip Wood
2019-06-21 7:47 ` Rohit Ashiwal
2019-06-18 17:06 ` [GSoC][PATCH v5 5/5] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-06-21 9:17 ` [GSoC][PATCH v6 0/5] Teach cherry-pick/revert to skip commits Rohit Ashiwal
2019-06-21 9:17 ` [GSoC][PATCH v6 1/5] sequencer: add advice for revert Rohit Ashiwal
2019-06-21 9:17 ` [GSoC][PATCH v6 2/5] sequencer: rename reset_for_rollback to reset_merge Rohit Ashiwal
2019-06-21 9:17 ` [GSoC][PATCH v6 3/5] sequencer: use argv_array in reset_merge Rohit Ashiwal
2019-06-21 9:17 ` [GSoC][PATCH v6 4/5] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-21 9:18 ` [GSoC][PATCH v6 5/5] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-06-21 19:09 ` [GSoC][PATCH v6 0/5] Teach cherry-pick/revert to skip commits Junio C Hamano
2019-06-23 20:03 ` [GSoC][PATCH v7 0/6] " Rohit Ashiwal
2019-06-23 20:03 ` [GSoC][PATCH v7 1/6] advice: add sequencerInUse config variable Rohit Ashiwal
2019-06-25 9:18 ` Thomas Gummerer
2019-06-23 20:03 ` [GSoC][PATCH v7 2/6] sequencer: add advice for revert Rohit Ashiwal
2019-06-29 14:05 ` Phillip Wood
2019-06-23 20:03 ` [GSoC][PATCH v7 3/6] sequencer: rename reset_for_rollback to reset_merge Rohit Ashiwal
2019-06-23 20:03 ` [GSoC][PATCH v7 4/6] sequencer: use argv_array in reset_merge Rohit Ashiwal
2019-06-23 20:03 ` [GSoC][PATCH v7 5/6] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-06-23 20:03 ` [GSoC][PATCH v7 6/6] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 0/5] Teach cherry-pick/revert to skip commits Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 1/5] sequencer: add advice for revert Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 2/5] sequencer: rename reset_for_rollback to reset_merge Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 3/5] sequencer: use argv_array in reset_merge Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 4/5] cherry-pick/revert: add --skip option Rohit Ashiwal
2019-07-02 9:11 ` [GSoC][PATCH v8 5/5] cherry-pick/revert: advise using --skip Rohit Ashiwal
2019-07-02 15:26 ` Phillip Wood [this message]
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=64b16b96-8c87-8010-9355-2d13c55f9d2f@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=martin.agren@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=rohit.ashiwal265@gmail.com \
--cc=t.gummerer@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).