All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: John Keeping <john@keeping.me.uk>
Cc: git@vger.kernel.org, Ralf Thielow <ralf.thielow@gmail.com>
Subject: Re: [PATCH v2] rebase -i: respect core.commentchar
Date: Tue, 12 Feb 2013 10:23:16 -0800	[thread overview]
Message-ID: <7vehglgzmz.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130212180917.GD13501@farnsworth.metanate.com> (John Keeping's message of "Tue, 12 Feb 2013 18:09:17 +0000")

John Keeping <john@keeping.me.uk> writes:

> On Tue, Feb 12, 2013 at 10:00:26AM -0800, Junio C Hamano wrote:
>>
>> So it needs to be more like this, and I think it still is more
>> readable.
>
> Agreed.  Will you squash this in or do you want a re-roll?

I can squash this and the previous one into your original to a
single commit.  Thanks.

>
>> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
>> index cbe36bf..8b3e2cd 100755
>> --- a/t/t3404-rebase-interactive.sh
>> +++ b/t/t3404-rebase-interactive.sh
>> @@ -945,13 +945,11 @@ test_expect_success 'rebase -i respects core.commentchar' '
>>  	git checkout E^0 &&
>>  	git config core.commentchar "\\" &&
>>  	test_when_finished "git config --unset core.commentchar" &&
>> -	cat >comment-lines.sh <<EOF &&
>> -#!$SHELL_PATH
>> -sed -e "2,\$ s/^/\\\\\\/" "\$1" >"\$1".tmp
>> -mv "\$1".tmp "\$1"
>> -EOF
>> -	chmod a+x comment-lines.sh &&
>> -	test_set_editor "$(pwd)/comment-lines.sh" &&
>> +	write_script remove-all-but-first.sh <<-\EOF &&
>> +	sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
>> +	mv "$1.tmp" "$1"
>> +	EOF
>> +	test_set_editor "$(pwd)/remove-all-but-first.sh" &&
>>  	git rebase -i B &&
>>  	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
>>  '

      reply	other threads:[~2013-02-12 18:23 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-11 19:21 [PATCH] rebase -i: respect core.commentchar John Keeping
2013-02-11 20:17 ` Junio C Hamano
2013-02-11 21:39   ` John Keeping
2013-02-11 21:49     ` Junio C Hamano
2013-02-11 23:08       ` [PATCH v2] " John Keeping
2013-02-12  0:13         ` Junio C Hamano
2013-02-12  9:53           ` John Keeping
2013-02-12 17:29             ` Junio C Hamano
2013-02-12 17:53               ` John Keeping
2013-02-12 18:21                 ` Junio C Hamano
2013-02-12 18:00               ` Junio C Hamano
2013-02-12 18:09                 ` John Keeping
2013-02-12 18:23                   ` Junio C Hamano [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=7vehglgzmz.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=john@keeping.me.uk \
    --cc=ralf.thielow@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.