From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Nazri Ramliy <ayiehere@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: 2.6.0: Comment in rebase instruction has become too rigid
Date: Tue, 29 Sep 2015 11:30:45 -0700 [thread overview]
Message-ID: <xmqqeghh9iy2.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqk2r99jjp.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 29 Sep 2015 11:17:46 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> I know you alluded to preprocess what is fed to stripspace, but I
> wonder if we can remove the misguided call to stripspace in the
> first place and do something like the attached instead.
>
> git-rebase--interactive.sh | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index f01637b..a64f77a 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -886,7 +886,6 @@ check_commit_sha () {
> # from the todolist in stdin
> check_bad_cmd_and_sha () {
> retval=0
> - git stripspace --strip-comments |
> (
> while read -r line
> do
> @@ -896,7 +895,7 @@ check_bad_cmd_and_sha () {
> sha1=$2
>
> case $command in
> - ''|noop|x|"exec")
> + '#'*|''|noop|x|"exec")
> # Doesn't expect a SHA-1
> ;;
> pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f)
Nah, that would not work, as I misread the "split only at SP" manual
parsing of $line.
I shouldn't be responding to the git list traffic on my vacation
day, especially before my first caffeine X-<
next prev parent reply other threads:[~2015-09-29 18:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-29 14:02 2.6.0: Comment in rebase instruction has become too rigid Nazri Ramliy
2015-09-29 15:05 ` Matthieu Moy
2015-09-29 17:01 ` Matthieu Moy
2015-09-29 18:17 ` Junio C Hamano
2015-09-29 18:30 ` Junio C Hamano [this message]
2015-09-29 18:31 ` Ralf Thielow
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=xmqqeghh9iy2.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=ayiehere@gmail.com \
--cc=git@vger.kernel.org \
/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).