From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "René Scharfe" <l.s.r@web.de>, "Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v2 0/3] Quieter sequencer status parsing
Date: Thu, 27 Jun 2019 07:12:43 -0700 (PDT) [thread overview]
Message-ID: <pull.275.v2.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.275.git.gitgitgadget@gmail.com>
Thanks for the comments on v1. I've updated the commit message of the second
patch to try and explain why the new function is not a straight-forward copy
of the old code
If we cannot parse the oid in the sequencer todo file do not show an error
when running git status but instead report that a cherry-pick or revert is
in progress. This addresses a confusing error message reported in
https://public-inbox.org/git/3bc58c33-4268-4e7c-bf1a-fe349b3cb037@www.fastmail.com/
These patches are based on maint
Cc: Johannes Schindelin Johannes.Schindelin@gmx.de
[Johannes.Schindelin@gmx.de]
Phillip Wood (3):
sequencer: always allow tab after command name
sequencer: factor out todo command name parsing
status: do not report errors in sequencer/todo
sequencer.c | 43 +++++++++++++++++++++---------------------
t/t7512-status-help.sh | 16 ++++++++++++++++
2 files changed, 37 insertions(+), 22 deletions(-)
base-commit: b697d92f56511e804b8ba20ccbe7bdc85dc66810
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-275%2Fphillipwood%2Fwip%2Fquieter%C2%A0sequencer%C2%A0status%C2%A0parsing-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-275/phillipwood/wip/quieter sequencer status parsing-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/275
Range-diff vs v1:
1: a5bede1cf9 = 1: a5bede1cf9 sequencer: always allow tab after command name
2: ebe8a2b3a1 ! 2: c3885c0b8f sequencer: factor out todo command name parsing
@@ -3,9 +3,19 @@
sequencer: factor out todo command name parsing
Factor out the code that parses the name of the command at the start of
- each line in the todo file into it's own function so that it can be used
+ each line in the todo file into its own function so that it can be used
in the next commit.
+ As I don't want to burden other callers with having to pass in a pointer
+ to the end of the line the test for an abbreviated command is
+ changed. This change should not affect the behavior. Instead of testing
+ `eol == bol + 1` the new code checks for the end of the line by testing
+ for '\n', '\r' or '\0' following the abbreviated name. To avoid reading
+ past the end of an empty string it also checks that there is actually a
+ single character abbreviation before testing if it matches. This
+ prevents it from matching '\0' as the abbreviated name and then trying
+ to read another character.
+
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
diff --git a/sequencer.c b/sequencer.c
3: af4b823caa = 3: 3e8fb61fb8 status: do not report errors in sequencer/todo
--
gitgitgadget
next prev parent reply other threads:[~2019-06-27 14:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 10:11 [PATCH 0/3] Wip/quieter sequencer status parsing Phillip Wood via GitGitGadget
2019-06-25 10:11 ` [PATCH 1/3] sequencer: always allow tab after command name Phillip Wood via GitGitGadget
2019-06-25 10:11 ` [PATCH 2/3] sequencer: factor out todo command name parsing Phillip Wood via GitGitGadget
2019-06-25 17:03 ` René Scharfe
2019-06-25 17:54 ` Phillip Wood
2019-06-25 10:11 ` [PATCH 3/3] status: do not report errors in sequencer/todo Phillip Wood via GitGitGadget
2019-06-25 11:56 ` Johannes Schindelin
2019-06-25 20:44 ` Junio C Hamano
2019-06-26 8:57 ` Phillip Wood
2019-07-01 14:40 ` Phillip Wood
2019-06-25 13:26 ` [PATCH 0/3] Wip/quieter sequencer status parsing Phillip Wood
2019-06-27 14:12 ` Phillip Wood via GitGitGadget [this message]
2019-06-27 14:12 ` [PATCH v2 1/3] sequencer: always allow tab after command name Phillip Wood via GitGitGadget
2019-06-27 17:19 ` Junio C Hamano
2019-06-27 14:12 ` [PATCH v2 2/3] sequencer: factor out todo command name parsing Phillip Wood via GitGitGadget
2019-06-27 17:29 ` Junio C Hamano
2019-06-27 14:12 ` [PATCH v2 3/3] status: do not report errors in sequencer/todo Phillip Wood via GitGitGadget
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=pull.275.v2.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
/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.