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"
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
