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

2015-09-29 Thread Ralf Thielow
2015-09-29 20:17 GMT+02:00 Junio C Hamano : > Matthieu Moy writes: > >>> Confirmed: Git 2.1.4 accepts this, 2.6 doesn't: >>> >>> Warning: the command isn't recognized in the following line: >>> - # pick dbafac11052a0075233bdcf0b71f54d1503aa82d test >>> >>> You can fix this with 'git rebase --edit

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

2015-09-29 Thread Junio C Hamano
Junio C Hamano writes: > 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 delet

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

2015-09-29 Thread Junio C Hamano
Matthieu Moy writes: >> Confirmed: Git 2.1.4 accepts this, 2.6 doesn't: >> >> Warning: the command isn't recognized in the following line: >> - # pick dbafac11052a0075233bdcf0b71f54d1503aa82d test >> >> You can fix this with 'git rebase --edit-todo'. >> Or you can abort the rebase with 'git reba

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

2015-09-29 Thread Matthieu Moy
Matthieu Moy writes: > Nazri Ramliy writes: > >> I'd hit that key in my editor that filters the pick instructions add >> inserts the list of the modified files in each commit so that the >> instruction sheet becomes like this: >> >> pick deadbeef some commit message >> # M path/to/foo.txt

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

2015-09-29 Thread Matthieu Moy
Nazri Ramliy writes: > I'd hit that key in my editor that filters the pick instructions add > inserts the list of the modified files in each commit so that the > instruction sheet becomes like this: > > pick deadbeef some commit message > # M path/to/foo.txt | 15 -- > pick ca

2.6.0: Comment in rebase instruction has become too rigid

2015-09-29 Thread Nazri Ramliy
Hi, I noticed that the format of the comment lines in a rebase instruction sheet has become stricter - it could no longer begin with spaces or tabs. The comment char ("#" for example) has to appear on the first column. This break my little script (activated via some key binding in my $EDITOR) for