From: "Torsten Bögershausen" <tboegi@web•de>
To: Junio C Hamano <gitster@pobox•com>,
git@vger•kernel.org, Matthieu Moy <Matthieu.Moy@imag•fr>,
remi.galan-alfonso@ensimag•grenoble-inp.fr
Subject: Re: What's cooking in git.git (Oct 2015, #01; Mon, 5)
Date: Tue, 6 Oct 2015 06:45:49 +0200 [thread overview]
Message-ID: <561351FD.9020102@web.de> (raw)
In-Reply-To: <xmqqwpv0x6op.fsf@gitster.mtv.corp.google.com>
On 06.10.15 00:59, Junio C Hamano wrote:
> * gr/rebase-i-drop-warn (2015-10-02) 2 commits
> - rebase-i: loosen over-eager check_bad_cmd check
> - rebase-i: explicitly accept tab as separator in commands
>
> "git rebase -i" had a minor regression recently, which stopped
> considering a line that begins with an indented '#' in its insn
> sheet not a comment, which is now fixed.
>
> Will merge to 'next'.
This is breaking using a non-gnu sed, which doesn't handle "\t"...
The solution is to replace "\t" with a literal TAB.
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 3da3ba3..3de0b1d 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1232,7 +1232,7 @@ test_expect_success 'tabs and spaces are accepted in the todolist' '
write_script add-indent.sh <<-\EOF &&
(
# Turn single spaces into space/tab mix
- sed "1s/ /\t/g; 2s/ / /g; 3s/ / \t/g" "$1"
+ sed "1s/ / /g; 2s/ / /g; 3s/ / /g" "$1"
printf "\n\t# comment\n #more\n\t # comment\n"
) >$1.new
mv "$1.new" "$1"
next prev parent reply other threads:[~2015-10-06 4:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-05 22:59 What's cooking in git.git (Oct 2015, #01; Mon, 5) Junio C Hamano
2015-10-06 3:02 ` Torsten Bögershausen
2015-10-06 5:55 ` Junio C Hamano
2015-10-06 19:30 ` Mike Rappazzo
2015-10-06 4:45 ` Torsten Bögershausen [this message]
2015-10-06 5:35 ` Junio C Hamano
2015-10-06 6:32 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=561351FD.9020102@web.de \
--to=tboegi@web$(echo .)de \
--cc=Matthieu.Moy@imag$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=remi.galan-alfonso@ensimag$(echo .)grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox