From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: git@vger.kernel.org,
"Galan Rémi" <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Subject: Re: [PATCH] rebase: accept indented comments (fixes regression)
Date: Wed, 30 Sep 2015 13:34:02 -0700 [thread overview]
Message-ID: <xmqq8u7n7ikl.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <vpqh9mbhek2.fsf@grenoble-inp.fr> (Matthieu Moy's message of "Wed, 30 Sep 2015 21:50:37 +0200")
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> + pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f)
>> + if ! check_commit_sha "${rest%% *}" "$lineno" "$1"
>
> This does not pass my "tabs" test, as it parses the sha1 out of the line
> assuming it's separated with a space.
Yes, it was very much deliberate to match what transform_todo_ids does.
I do not think we mind loosening this SP to SP/HT at all, but if we
are going to go in that direction, I'd very much more prefer to do
"${rest%%[ ]*}"
here _and_ in transform_todo_ids so that we can keep the identical
parsing, which is the primary point of the "regression fix", rather
than doing this:
> I changed it to
>
> while read -r command sha1 rest
>
> which is a bit more lazy.
which is to invite the two parsers drift apart over time.
Thanks.
next prev parent reply other threads:[~2015-09-30 20:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 8:11 [PATCH] rebase: accept indented comments (fixes regression) Matthieu Moy
2015-09-30 9:58 ` Remi Galan Alfonso
2015-09-30 18:05 ` Junio C Hamano
2015-09-30 19:17 ` Matthieu Moy
2015-09-30 19:31 ` Junio C Hamano
2015-09-30 19:18 ` Junio C Hamano
2015-09-30 19:50 ` Matthieu Moy
2015-09-30 20:34 ` Junio C Hamano [this message]
2015-10-01 8:18 ` [PATCH v3 1/2] rebase-i: explicitly accept tab as separator in commands Matthieu Moy
2015-10-01 8:18 ` [PATCH v3 2/2] rebase-i: loosen over-eager check_bad_cmd check Matthieu Moy
2015-09-30 20:01 ` [PATCH] " Matthieu Moy
2015-09-30 20:04 ` Eric Sunshine
2015-09-30 20:10 ` [PATCH v2] " Matthieu Moy
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=xmqq8u7n7ikl.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
/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).