From: Adam Simpkins <simpkins@facebook.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"Santi Béjar" <santi@agolina.net>,
"Git Mailing List" <git@vger.kernel.org>
Subject: [PATCH] Add test case for rev-list --parents --show-all
Date: Wed, 19 Aug 2009 15:58:52 -0700 [thread overview]
Message-ID: <20090819225852.GA21187@facebook.com> (raw)
In-Reply-To: <20090819225547.GR8147@facebook.com>
This test case ensures that rev-list --parents --show-all gets the
parent history correct. Normally, --parents rewrites parent history to
skip TREESAME parents. However, --show-all causes TREESAME parents to
still be included in the revision list, so the parents should still be
included too.
Signed-off-by: Adam Simpkins <simpkins@facebook.com>
---
Looking through the code, I believe TREESAME commits are the only ones
affected by my earlier bug in simplify_commit().
t/t6015-rev-list-show-all-parents.sh | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
create mode 100644 t/t6015-rev-list-show-all-parents.sh
diff --git a/t/t6015-rev-list-show-all-parents.sh b/t/t6015-rev-list-show-all-parents.sh
new file mode 100644
index 0000000..8b146fb
--- /dev/null
+++ b/t/t6015-rev-list-show-all-parents.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+test_description='--show-all --parents does not rewrite TREESAME commits'
+
+. ./test-lib.sh
+
+test_expect_success 'set up --show-all --parents test' '
+ test_commit one foo.txt &&
+ commit1=`git rev-list -1 HEAD` &&
+ test_commit two bar.txt &&
+ commit2=`git rev-list -1 HEAD` &&
+ test_commit three foo.txt &&
+ commit3=`git rev-list -1 HEAD`
+ '
+
+test_expect_success '--parents rewrites TREESAME parents correctly' '
+ echo $commit3 $commit1 > expected &&
+ echo $commit1 >> expected &&
+ git rev-list --parents HEAD -- foo.txt > actual &&
+ test_cmp expected actual
+ '
+
+test_expect_success '--parents --show-all does not rewrites TREESAME parents' '
+ echo $commit3 $commit2 > expected &&
+ echo $commit2 $commit1 >> expected &&
+ echo $commit1 >> expected &&
+ git rev-list --parents --show-all HEAD -- foo.txt > actual &&
+ test_cmp expected actual
+ '
+
+test_done
--
1.6.0.4
next prev parent reply other threads:[~2009-08-19 22:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-18 20:55 interaction between --graph and --simplify-by-decoration Adam Simpkins
2009-08-18 21:18 ` [PATCH] graph API: fix bug in graph_is_interesting() Adam Simpkins
2009-08-18 23:53 ` Junio C Hamano
2009-08-19 2:29 ` Adam Simpkins
2009-08-19 2:34 ` Adam Simpkins
2009-08-19 6:18 ` Junio C Hamano
2009-08-19 6:25 ` Junio C Hamano
2009-08-19 22:55 ` Adam Simpkins
2009-08-19 22:58 ` Adam Simpkins [this message]
2009-08-20 4:13 ` [PATCH] Add test case for rev-list --parents --show-all Junio C Hamano
2009-08-21 18:20 ` [PATCH] Add tests for rev-list --graph with options that simplify history Adam Simpkins
2009-08-21 20:15 ` Junio C Hamano
2009-08-21 21:23 ` Adam Simpkins
2009-08-21 15:39 ` [PATCH] graph API: fix bug in graph_is_interesting() Santi Béjar
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=20090819225852.GA21187@facebook.com \
--to=simpkins@facebook.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=santi@agolina.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).