Re: 2.6.0: Comment in rebase instruction has become too rigid

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 29, 2015, 18:30 UTC
Message-ID: <xmqqeghh9iy2.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <xmqqk2r99jjp.fsf@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 28 quoted lines

> 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-<