Re: [PATCH v2 2/2] rebase -i: fix core.commentchar regression

2013-08-18 Thread Eric Sunshine
On Sun, Aug 18, 2013 at 5:14 PM, Junio C Hamano wrote: > Eric Sunshine writes: > >> Intended for 'next'. > > Thanks. > > Will queue on top of es/rebase-i-no-abbrev, but we have a chance to > rebuild 'next' after 1.8.4 release, so we may want to squash this > into the problematic commit when it ha

Re: [PATCH v2 2/2] rebase -i: fix core.commentchar regression

2013-08-18 Thread Junio C Hamano
Eric Sunshine writes: > Intended for 'next'. Thanks. Will queue on top of es/rebase-i-no-abbrev, but we have a chance to rebuild 'next' after 1.8.4 release, so we may want to squash this into the problematic commit when it happens. > > git-rebase--interactive.sh | 2 +- > 1 file changed, 1 i

[PATCH v2 2/2] rebase -i: fix core.commentchar regression

2013-08-18 Thread Eric Sunshine
9a46c25bdbf79744 (rebase: interactive: fix short SHA-1 collision, 2013-08-12) added transform_todo_ids() which assumes incorrectly that the comment character is always '#', however, this has not been the case since 180bad3d10fe3a7f (rebase -i: respect core.commentchar, 2013-02-11) patched rebase -i