On Sun, Jul 08, 2018 at 09:41:11PM +0300, Daniel Harding wrote: > Signed-off-by: Daniel Harding <dhard...@living180.net>
I think maybe, as you suggested, a separate test for this would be beneficial. It might be as simple as modifying 'script-from-scratch' by doing "sed 's/#/>/'". > diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh > index 78f7c9958..ff474d033 100755 > --- a/t/t3430-rebase-merges.sh > +++ b/t/t3430-rebase-merges.sh > @@ -56,12 +56,12 @@ test_expect_success 'create completely different > structure' ' > cat >script-from-scratch <<-\EOF && > label onto > > - # onebranch > + > onebranch > pick G > pick D > label onebranch > > - # second > + > second > reset onto > pick B > label second Should this affect the "# Merge the topic branch" line (and the "# C", "# E", and "# H" lines in the next test) that appears below this? It would seem those would qualify as comments as well. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204
signature.asc
Description: PGP signature
