From: Daniel Harding <dharding@living180.net>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 0/2] Fix --rebase-merges with custom commentChar
Date: Sun, 8 Jul 2018 21:41:08 +0300 [thread overview]
Message-ID: <20180708184110.14792-1-dharding@living180.net> (raw)
I have core.commentChar set in my .gitconfig, and when I tried to run
git rebase -i -r, I received an error message like the following:
error: invalid line 3: # Branch <name>
To fix this, I updated sequencer.c to use the configured commentChar
for the Branch <name> comments. I also tweaked the tests in t3430 to
verify todo list generation with a custom commentChar. I'm not sure
if I took the right approach with that, or if it would be better to
add additional tests for that case, so feel free to
tweak/replace/ignore the second commit as appropriate.
Thanks,
Daniel Harding
next reply other threads:[~2018-07-08 18:51 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-08 18:41 Daniel Harding [this message]
2018-07-08 18:41 ` [PATCH 1/2] sequencer: fix --rebase-merges with custom commentChar Daniel Harding
2018-07-08 18:41 ` [PATCH 2/2] t3430: update to test " Daniel Harding
2018-07-08 21:02 ` brian m. carlson
2018-07-09 7:52 ` Johannes Schindelin
2018-07-09 16:46 ` Junio C Hamano
2018-07-09 18:22 ` Daniel Harding
2018-07-09 19:09 ` Johannes Schindelin
2018-07-09 20:05 ` Junio C Hamano
2018-07-09 18:48 ` Daniel Harding
2018-07-09 19:14 ` Johannes Schindelin
2018-07-10 12:29 ` Daniel Harding
2018-07-10 13:08 ` Johannes Schindelin
2018-07-10 13:49 ` Daniel Harding
2018-10-02 14:38 ` Johannes Schindelin
2018-07-09 23:41 ` brian m. carlson
2018-07-09 7:53 ` [PATCH 0/2] Fix --rebase-merges " Johannes Schindelin
2018-07-10 13:24 ` Daniel Harding
2018-07-12 3:02 ` Aaron Schrab
2018-07-12 17:15 ` Junio C Hamano
2018-07-16 4:59 ` [PATCH v3] sequencer: use configured comment character Aaron Schrab
2018-07-16 15:59 ` Johannes Schindelin
2018-07-16 18:49 ` Daniel Harding
2018-07-17 16:46 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180708184110.14792-1-dharding@living180.net \
--to=dharding@living180.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.