From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ben Boeckel" <mathstuf@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Heba Waly" <heba.waly@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 5/5] advice.[ch]: sort enum fields in alphabetical order
Date: Mon, 4 Oct 2021 03:58:24 +0200 [thread overview]
Message-ID: <patch-5.5-171153d421e-20211004T015432Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.5-00000000000-20211004T015432Z-avarab@gmail.com>
These fields have slightly drifted out of order, let's re-order them.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
advice.c | 2 +-
advice.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/advice.c b/advice.c
index f7cedac7549..e0ee8ca4f2f 100644
--- a/advice.c
+++ b/advice.c
@@ -51,9 +51,9 @@ static struct {
[ADVICE_PUSH_ALREADY_EXISTS] = { "advice.pushAlreadyExists" },
[ADVICE_PUSH_FETCH_FIRST] = { "advice.pushFetchFirst" },
[ADVICE_PUSH_NEEDS_FORCE] = { "advice.pushNeedsForce" },
- [ADVICE_PUSH_REF_NEEDS_UPDATE] = { "advice.pushRefNeedsUpdate" },
[ADVICE_PUSH_NON_FF_CURRENT] = { "advice.pushNonFFCurrent" },
[ADVICE_PUSH_NON_FF_MATCHING] = { "advice.pushNonFFMatching" },
+ [ADVICE_PUSH_REF_NEEDS_UPDATE] = { "advice.pushRefNeedsUpdate" },
[ADVICE_PUSH_UNQUALIFIED_REF_NAME] = { "advice.pushUnqualifiedRefName" },
[ADVICE_PUSH_UPDATE_REJECTED] = { "advice.pushUpdateRejected" },
[ADVICE_RESET_QUIET_WARNING] = { "advice.resetQuiet" },
diff --git a/advice.h b/advice.h
index ab25c6ba9a0..a6aca9684c7 100644
--- a/advice.h
+++ b/advice.h
@@ -31,9 +31,9 @@ enum advice_type {
ADVICE_PUSH_NEEDS_FORCE,
ADVICE_PUSH_NON_FF_CURRENT,
ADVICE_PUSH_NON_FF_MATCHING,
+ ADVICE_PUSH_REF_NEEDS_UPDATE,
ADVICE_PUSH_UNQUALIFIED_REF_NAME,
ADVICE_PUSH_UPDATE_REJECTED,
- ADVICE_PUSH_REF_NEEDS_UPDATE,
ADVICE_RESET_QUIET_WARNING,
ADVICE_RESOLVE_CONFLICT,
ADVICE_RM_HINTS,
--
2.33.0.1404.g7bcfc82b295
prev parent reply other threads:[~2021-10-04 1:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-04 1:58 [PATCH 0/5] advice API: simplification, small fixes, readability Ævar Arnfjörð Bjarmason
2021-10-04 1:58 ` [PATCH 1/5] advice.h: don't indent top-level enum Ævar Arnfjörð Bjarmason
2021-10-04 1:58 ` [PATCH 2/5] advice output: emit empty lines as "hint:", not "hint: " Ævar Arnfjörð Bjarmason
2021-10-04 1:58 ` [PATCH 3/5] advice.[ch]: remove advice.pushNonFastForward alias Ævar Arnfjörð Bjarmason
2021-10-04 1:58 ` [PATCH 4/5] advice API: revamp the API, again Ævar Arnfjörð Bjarmason
2021-10-04 1:58 ` Ævar Arnfjörð Bjarmason [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-5.5-171153d421e-20211004T015432Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=heba.waly@gmail.com \
--cc=mathstuf@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.