Re: [PATCH v2] rebase -i: respect core.commentchar
From: John Keeping <hidden>
Date: 2016-06-15 22:56:08
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH v2] rebase -i: respect core.commentchar · John Keeping <hidden>
- 2016-06-15 · Re: [PATCH v2] rebase -i: respect core.commentchar · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH v2] rebase -i: respect core.commentchar · John Keeping <hidden>
- 2016-06-15 · Re: [PATCH v2] rebase -i: respect core.commentchar · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH v2] rebase -i: respect core.commentchar · John Keeping <hidden>
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?
quoted hunk ↗ jump to hunk
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) '