From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH 14/23] Introduce --tree-same.
Date: Sat, 23 Apr 2011 17:22:43 +1000 [thread overview]
Message-ID: <1303543372-77843-15-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1303543372-77843-1-git-send-email-jon.seymour@gmail.com>
---
Documentation/git-test.txt | 2 ++
git-conditions-lib.sh | 12 ++++++++++++
t/t1520-test.sh | 9 +++++++++
3 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-test.txt b/Documentation/git-test.txt
index e28ed88..6709fdd 100644
--- a/Documentation/git-test.txt
+++ b/Documentation/git-test.txt
@@ -88,6 +88,8 @@ CONDITIONS
Tests if the specified branch is (not) checked out.
'--reachable'|'--not-reachable' first second::
Tests if the first commit is (not) reachable from the second.
+'--tree-same'|'--not-tree-same' first second::
+ Tests if the first commit is (not) tree-same to the second commit.
EXTENDING THE CONDITION LIBRARY
-------------------------------
diff --git a/git-conditions-lib.sh b/git-conditions-lib.sh
index 0223fcd..2b7a5d1 100644
--- a/git-conditions-lib.sh
+++ b/git-conditions-lib.sh
@@ -150,5 +150,17 @@ check_reachable_2()
fi
}
+check_tree_same_2()
+{
+ if git diff-tree --quiet "$1" "$2"
+ then
+ echo "'$1' has the same tree as '$2'."
+ else
+ echo "'$1' does not have the same tree as '$2'."
+ false
+ fi
+
+}
+
fi
diff --git a/t/t1520-test.sh b/t/t1520-test.sh
index 3e33f8a..1fd5122 100755
--- a/t/t1520-test.sh
+++ b/t/t1520-test.sh
@@ -399,4 +399,13 @@ test_expect_success 'git test --not-reachable F C' \
git test --not-reachable F C
'
+test_expect_success 'tree-same' \
+'
+ git test \
+ --tree-same master HEAD \
+ --tree-same D D1 \
+ --not-tree-same C D
+
+'
+
test_done
--
1.7.5.rc1.23.g7f622
next prev parent reply other threads:[~2011-04-23 7:24 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-23 7:22 [PATCH 00/23] RFC: Introducing git-test, git-atomic, git-base and git-work Jon Seymour
2011-04-23 7:22 ` [PATCH 01/23] Introduce git-test.sh and git-test-lib.sh Jon Seymour
2011-04-27 19:11 ` Drew Northup
2011-04-23 7:22 ` [PATCH 02/23] Introduce --unstaged Jon Seymour
2011-04-23 7:22 ` [PATCH 03/23] Introduce --staged Jon Seymour
2011-04-23 7:22 ` [PATCH 04/23] Introduce --untracked Jon Seymour
2011-04-23 7:22 ` [PATCH 05/23] Introduce --conflicted Jon Seymour
2011-04-23 7:22 ` [PATCH 06/23] Introduce --rebasing Jon Seymour
2011-04-23 7:22 ` [PATCH 07/23] Introduce --detached Jon Seymour
2011-04-23 7:22 ` [PATCH 08/23] Introduce --branch-exists Jon Seymour
2011-04-23 7:22 ` [PATCH 09/23] Introduce --tag-exists Jon Seymour
2011-04-23 7:22 ` [PATCH 10/23] Introduce --ref-exists Jon Seymour
2011-04-23 7:22 ` [PATCH 11/23] Introduce --commit-exists Jon Seymour
2011-04-23 7:22 ` [PATCH 12/23] Introduce --checked-out Jon Seymour
2011-04-23 7:22 ` [PATCH 13/23] Introduce --reachable Jon Seymour
2011-04-23 7:22 ` Jon Seymour [this message]
2011-04-23 7:22 ` [PATCH 15/23] Introduce --same Jon Seymour
2011-04-23 7:22 ` [PATCH 16/23] misc Jon Seymour
2011-04-23 7:22 ` [PATCH 17/23] whitespace fix Jon Seymour
2011-04-23 7:22 ` [PATCH 18/23] tests --conflicted Jon Seymour
2011-04-23 7:22 ` [PATCH 19/23] rebasing: add tests Jon Seymour
2011-04-23 7:22 ` [PATCH 20/23] test: git test cleanups Jon Seymour
2011-04-23 7:22 ` [PATCH 21/23] Introduce git-atomic Jon Seymour
2011-04-23 7:22 ` [PATCH 22/23] Introduce git base Jon Seymour
2011-04-23 7:22 ` [PATCH 23/23] Introduce support for the git-work command Jon Seymour
2011-04-23 9:13 ` [PATCH 00/23] RFC: Introducing git-test, git-atomic, git-base and git-work Peter Baumann
2011-04-23 17:16 ` Jon Seymour
2011-04-23 18:37 ` Jon Seymour
2011-04-24 15:47 ` Jon Seymour
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=1303543372-77843-15-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--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 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).