From: Daniel Harding <dharding@living180.net>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Daniel Harding <dharding@living180.net>
Subject: [PATCH 2/2] t3430: update to test with custom commentChar
Date: Sun, 8 Jul 2018 21:41:11 +0300 [thread overview]
Message-ID: <20180708184110.14792-3-dharding@living180.net> (raw)
In-Reply-To: <20180708184110.14792-1-dharding@living180.net>
Signed-off-by: Daniel Harding <dharding@living180.net>
---
t/t3430-rebase-merges.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
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
@@ -70,6 +70,7 @@ test_expect_success 'create completely different structure' '
merge -C H second
merge onebranch # Merge the topic branch '\''onebranch'\''
EOF
+ test_config core.commentChar ">" &&
test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
test_tick &&
git rebase -i -r A &&
@@ -107,10 +108,10 @@ test_expect_success 'generate correct todo list' '
pick 12bd07b D
merge -C 2051b56 E # E
merge -C 233d48a H # H
-
EOF
- grep -v "^#" <.git/ORIGINAL-TODO >output &&
+ test_config core.commentChar ">" &&
+ git stripspace -s <.git/ORIGINAL-TODO >output &&
test_cmp expect output
'
--
2.18.0
next prev parent 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 [PATCH 0/2] Fix --rebase-merges with custom commentChar Daniel Harding
2018-07-08 18:41 ` [PATCH 1/2] sequencer: fix " Daniel Harding
2018-07-08 18:41 ` Daniel Harding [this message]
2018-07-08 21:02 ` [PATCH 2/2] t3430: update to test " 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180708184110.14792-3-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).