From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Allan Caffee <allan.caffee@gmail.com>,
Noam Postavsky <npostavs@users.sourceforge.net>
Subject: [BUG/PATCH 2/5] t4214: use test_merge
Date: Wed, 25 Sep 2019 03:27:03 -0700 [thread overview]
Message-ID: <4a93deb3f62088b9bdb615adfb126581659914b4.1569407150.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1569407150.git.liu.denton@gmail.com>
In the previous commit, we extended test_merge() so that it could
perform octopus merges. Now that the restriction is lifted, use
test_merge() to perform the octopus merge instead of manually
duplicating test_merge() functionality.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
t/t4214-log-graph-octopus.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/t/t4214-log-graph-octopus.sh b/t/t4214-log-graph-octopus.sh
index dab96c89aa..f6e22ec825 100755
--- a/t/t4214-log-graph-octopus.sh
+++ b/t/t4214-log-graph-octopus.sh
@@ -41,8 +41,7 @@ test_expect_success 'set up merge history' '
test_commit $i $i $i tag$i || return $?
done &&
git checkout 1 -b merge &&
- test_tick &&
- git merge -m octopus-merge 1 2 3 4 &&
+ test_merge octopus-merge 1 2 3 4 &&
git checkout 1 -b L &&
test_commit left
'
--
2.23.0.248.g3a9dd8fb08
next prev parent reply other threads:[~2019-09-25 10:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 10:26 [BUG/PATCH 0/5] t4214: cleanup and demonstrate graph bug Denton Liu
2019-09-25 10:27 ` [BUG/PATCH 1/5] test-lib: let test_merge() perform octopus merges Denton Liu
2019-09-25 10:27 ` Denton Liu [this message]
2019-09-25 10:27 ` [BUG/PATCH 3/5] t4214: generate expect in their own test cases Denton Liu
2019-09-25 10:27 ` [BUG/PATCH 4/5] t4214: explicitly list tags in log Denton Liu
2019-09-25 10:27 ` [BUG/PATCH 5/5] t4214: demonstrate octopus graph coloring failure Denton Liu
2019-09-25 17:09 ` [BUG/PATCH 0/5] t4214: cleanup and demonstrate graph bug Denton Liu
2019-09-26 20:23 ` Jeff King
2019-10-03 22:16 ` Junio C Hamano
2019-10-04 0:23 ` [PATCH v2 " Denton Liu
2019-10-04 0:23 ` [PATCH v2 1/5] test-lib: let test_merge() perform octopus merges Denton Liu
2019-10-04 0:23 ` [PATCH v2 2/5] t4214: use test_merge Denton Liu
2019-10-04 0:23 ` [PATCH v2 3/5] t4214: generate expect in their own test cases Denton Liu
2019-10-04 0:23 ` [PATCH v2 4/5] t4214: explicitly list tags in log Denton Liu
2019-10-04 0:23 ` [PATCH v2 5/5] t4214: demonstrate octopus graph coloring failure Denton Liu
2019-10-04 5:50 ` [PATCH v2 0/5] t4214: cleanup and demonstrate graph bug Junio C Hamano
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=4a93deb3f62088b9bdb615adfb126581659914b4.1569407150.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=allan.caffee@gmail.com \
--cc=git@vger.kernel.org \
--cc=npostavs@users.sourceforge.net \
/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).