From: "Rubén Justo" <rjusto@gmail.com>
To: Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
ZheNing Hu <adlternative@gmail.com>,
Philippe Blain <levraiphilippeblain@gmail.com>
Subject: Re: [PATCH v2 0/2] Allow disabling advice shown after merge conflicts
Date: Mon, 11 Mar 2024 21:58:52 +0100 [thread overview]
Message-ID: <4e1abd12-d73f-41b2-a334-036be9093485@gmail.com> (raw)
In-Reply-To: <pull.1682.v2.git.1710100261.gitgitgadget@gmail.com>
On Sun, Mar 10, 2024 at 07:50:59PM +0000, Philippe Blain via GitGitGadget wrote:
> Range-diff vs v1:
>
> 1: e929d3381cf ! 1: a2ce6fd24c2 sequencer: allow disabling conflict advice
[...]
> ## advice.c ##
> @@ advice.c: static struct {
> - [ADVICE_RESET_NO_REFRESH_WARNING] = { "resetNoRefresh" },
> - [ADVICE_RESOLVE_CONFLICT] = { "resolveConflict" },
> - [ADVICE_RM_HINTS] = { "rmHints" },
> -+ [ADVICE_SEQUENCER_CONFLICT] = { "sequencerConflict" },
> - [ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse" },
> - [ADVICE_SET_UPSTREAM_FAILURE] = { "setUpstreamFailure" },
> - [ADVICE_SKIPPED_CHERRY_PICKS] = { "skippedCherryPicks" },
> + [ADVICE_GRAFT_FILE_DEPRECATED] = { "graftFileDeprecated" },
> + [ADVICE_IGNORED_HOOK] = { "ignoredHook" },
> + [ADVICE_IMPLICIT_IDENTITY] = { "implicitIdentity" },
> ++ [ADVICE_MERGE_CONFLICT] = { "mergeConflict" },
> + [ADVICE_NESTED_TAG] = { "nestedTag" },
> + [ADVICE_OBJECT_NAME_WARNING] = { "objectNameWarning" },
> + [ADVICE_PUSH_ALREADY_EXISTS] = { "pushAlreadyExists" },
You rename ADVICE_SEQUENCER_CONFLICT to ADVICE_MERGE_CONFLICT and place
the new name in the correct position, alphabetically. Nice.
> ## advice.h ##
> @@ advice.h: enum advice_type {
> - ADVICE_RESOLVE_CONFLICT,
> - ADVICE_RM_HINTS,
> - ADVICE_SEQUENCER_IN_USE,
> -+ ADVICE_SEQUENCER_CONFLICT,
> - ADVICE_SET_UPSTREAM_FAILURE,
> - ADVICE_SKIPPED_CHERRY_PICKS,
> - ADVICE_STATUS_AHEAD_BEHIND_WARNING,
> + ADVICE_IGNORED_HOOK,
> + ADVICE_IMPLICIT_IDENTITY,
> + ADVICE_NESTED_TAG,
> ++ ADVICE_MERGE_CONFLICT,
> + ADVICE_OBJECT_NAME_WARNING,
> + ADVICE_PUSH_ALREADY_EXISTS,
> + ADVICE_PUSH_FETCH_FIRST,
Here, I assume you're trying to place the new name correctly too.
However, I see that it's in the wrong place. It initially caught my
attention, but then I realize that the list is not sorted. So it's
understandable.
Maybe you want to sort the list as a preparatory patch in this series
and so we'll avoid this kind of mistakes.
Of course, this does not deserve a reroll. We can do it in a future
series when the dust settles.
next prev parent reply other threads:[~2024-03-11 20:59 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-02 16:18 [PATCH] sequencer: allow disabling conflict advice Philippe Blain via GitGitGadget
2024-03-02 16:32 ` Philippe Blain
2024-03-03 22:57 ` Junio C Hamano
2024-03-09 17:22 ` Philippe Blain
2024-03-09 18:58 ` Philippe Blain
2024-03-09 19:55 ` Junio C Hamano
2024-03-09 23:19 ` Junio C Hamano
2024-03-04 10:12 ` Phillip Wood
2024-03-04 10:27 ` Phillip Wood
2024-03-04 17:56 ` Junio C Hamano
2024-03-09 17:53 ` Philippe Blain
2024-03-09 19:15 ` Phillip Wood
2024-03-09 19:56 ` Junio C Hamano
2024-03-09 18:01 ` Philippe Blain
2024-03-10 19:50 ` [PATCH v2 0/2] Allow disabling advice shown after merge conflicts Philippe Blain via GitGitGadget
2024-03-10 19:51 ` [PATCH v2 1/2] sequencer: allow disabling conflict advice Philippe Blain via GitGitGadget
2024-03-11 10:29 ` Kristoffer Haugsbakk
2024-03-16 19:33 ` Philippe Blain
2024-03-10 19:51 ` [PATCH v2 2/2] builtin/am: " Philippe Blain via GitGitGadget
2024-03-11 10:54 ` phillip.wood123
2024-03-11 17:12 ` Junio C Hamano
2024-03-11 17:49 ` Junio C Hamano
2024-03-16 19:44 ` Philippe Blain
2024-03-16 20:01 ` Philippe Blain
2024-03-11 20:58 ` Rubén Justo [this message]
2024-03-16 20:33 ` [PATCH v2 0/2] Allow disabling advice shown after merge conflicts Philippe Blain
2024-03-16 21:16 ` [PATCH v3 " Philippe Blain via GitGitGadget
2024-03-16 21:16 ` [PATCH v3 1/2] sequencer: allow disabling conflict advice Philippe Blain via GitGitGadget
2024-03-16 21:16 ` [PATCH v3 2/2] builtin/am: " Philippe Blain via GitGitGadget
2024-03-18 16:31 ` [PATCH v3 0/2] Allow disabling advice shown after merge conflicts Junio C Hamano
2024-03-25 10:48 ` Phillip Wood
2024-03-25 16:57 ` Junio C Hamano
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=4e1abd12-d73f-41b2-a334-036be9093485@gmail.com \
--to=rjusto@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=adlternative@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=levraiphilippeblain@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).