From: Kevin Bracey <kevin@bracey.fi>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
John Keeping <john@keeping.me.uk>, Jeff King <peff@peff.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Michael J Gruber <git@drmicha.warpmail.net>,
Kevin Bracey <kevin@bracey.fi>
Subject: [PATCH 1/2] t6019: demonstrate --ancestry-path A...B breakage
Date: Mon, 13 May 2013 18:00:46 +0300 [thread overview]
Message-ID: <1368457247-19822-2-git-send-email-kevin@bracey.fi> (raw)
In-Reply-To: <1368457247-19822-1-git-send-email-kevin@bracey.fi>
Signed-off-by: Kevin Bracey <kevin@bracey.fi>
---
t/t6019-rev-list-ancestry-path.sh | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh
index 39b4cb0..5287f6a 100755
--- a/t/t6019-rev-list-ancestry-path.sh
+++ b/t/t6019-rev-list-ancestry-path.sh
@@ -13,6 +13,9 @@ test_description='--ancestry-path'
#
# D..M -- M.t == M
# --ancestry-path D..M -- M.t == M
+#
+# F...I == F G H I
+# --ancestry-path F...I == F H I
. ./test-lib.sh
@@ -63,13 +66,29 @@ test_expect_success 'rev-list D..M -- M.t' '
test_cmp expect actual
'
-test_expect_success 'rev-list --ancestry-patch D..M -- M.t' '
+test_expect_success 'rev-list --ancestry-path D..M -- M.t' '
echo M >expect &&
git rev-list --ancestry-path --format=%s D..M -- M.t |
sed -e "/^commit /d" >actual &&
test_cmp expect actual
'
+test_expect_success 'rev-list F...I' '
+ for c in F G H I; do echo $c; done >expect &&
+ git rev-list --format=%s F...I |
+ sed -e "/^commit /d" |
+ sort >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'rev-list --ancestry-path F...I' '
+ for c in F H I; do echo $c; done >expect &&
+ git rev-list --ancestry-path --format=%s F...I |
+ sed -e "/^commit /d" |
+ sort >actual &&
+ test_cmp expect actual
+'
+
# b---bc
# / \ /
# a X
--
1.8.3.rc0.28.g4b02ef5
next prev parent reply other threads:[~2013-05-13 15:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-11 12:23 [RFC/PATCH 0/2] merge-base: add --merge-child option John Keeping
2013-05-11 12:23 ` [RFC/PATCH 1/2] commit: add commit_list_contains function John Keeping
2013-05-11 12:23 ` [RFC/PATCH 2/2] merge-base: add --merge-child option John Keeping
2013-05-11 17:54 ` [RFC/PATCH 0/2] " Junio C Hamano
2013-05-11 18:48 ` John Keeping
2013-05-12 15:44 ` Kevin Bracey
2013-05-12 16:28 ` John Keeping
2013-05-12 16:33 ` John Keeping
2013-05-12 17:14 ` Kevin Bracey
2013-05-12 22:22 ` Junio C Hamano
2013-05-13 14:26 ` Kevin Bracey
2013-05-13 14:45 ` Michael J Gruber
2013-05-19 12:40 ` log --cherry and merges (was [RFC/PATCH 0/2] merge-base: add --merge-child option) John Keeping
2013-05-20 6:43 ` Jonathan Nieder
2013-05-13 15:00 ` [PATCH 0/2] Make --ancestry-path A...B work Kevin Bracey
2013-05-13 15:00 ` Kevin Bracey [this message]
2013-05-13 15:00 ` [PATCH 2/2] revision.c: treat A...B merge bases as if manually specified Kevin Bracey
2013-05-13 16:04 ` Junio C Hamano
2013-05-12 16:58 ` [RFC/PATCH 0/2] merge-base: add --merge-child option John Keeping
2013-05-12 17:29 ` Kevin Bracey
2013-05-13 5:02 ` Junio C Hamano
2013-05-13 7:52 ` John Keeping
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=1368457247-19822-2-git-send-email-kevin@bracey.fi \
--to=kevin@bracey.fi \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=jrnieder@gmail.com \
--cc=peff@peff.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.
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 NNTP newsgroup(s).