From: Eric Sunshine Date: Fri, 16 Aug 2013 22:19:58 GMT Subject: Re: [PATCH] rebase -i: fix cases ignoring core.commentchar Message-ID: In-Reply-To: On Fri, Aug 16, 2013 at 5:55 PM, Eric Sunshine wrote: > On Fri, Aug 16, 2013 at 5:44 PM, Eric Sunshine wrote: >> eff80a9fd990de36 (Allow custom "comment char", 2013-01-16) added general >> core.commentchar support but forgot to update git-rebase--interactive to >> respect it. 180bad3d10fe3a7f (rebase -i: respect core.commentchar, >> 2013-02-11) addressed this oversight but missed one instance of >> hard-coded '#' comment character in skip_unnecessary_picks(). Fix this. >> >> 9a46c25bdbf79744 (rebase: interactive: fix short SHA-1 collision, >> 2013-08-12) added another instance of hard-coded '#' comment character >> in transform_todo_ids(). Fix this, as well. >> >> Signed-off-by: Eric Sunshine > > I forgot to mention that I wanted to add tests to t3404 for these bugs > but couldn't figure out how to do it using the external behavior of > rebase -i. I was able to verify the before and after behavior by > adding temporary echo's to the code in order to observe the "internal" > functioning. One of the fixes in this patch addresses an oversight in 180bad3d10fe3a7f (rebase -i: respect core.commentchar, 2013-02-11) which is already in 'maint'. Should I split this patch in two so that the one fix can be applied to 'maint'? (The other fix is for 9a46c25bdbf79744 in 'next'.)