tests: move test_cmp_rev to test-lib-functions

A function for checking that two given parameters refer to the same
revision was defined in several places, so move the definition to
test-lib-functions.sh instead.

Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t1505-rev-parse-last.sh b/t/t1505-rev-parse-last.sh
index d709ecf8df136539a746ef1873821baee6fab428..4969edb31441c81cf2e63385d07d780a52faa53b 100755 (executable)
--- a/t/t1505-rev-parse-last.sh
+++ b/t/t1505-rev-parse-last.sh
@@ -32,32 +32,24 @@ test_expect_success 'setup' '
 #
 # and 'side' should be the last branch
 
 #
 # and 'side' should be the last branch
 

-test_rev_equivalent () {
-
-       git rev-parse "$1" > expect &&
-       git rev-parse "$2" > output &&
-       test_cmp expect output
-
-}
-

 test_expect_success '@{-1} works' '
 test_expect_success '@{-1} works' '

-       test_rev_equivalent side @{-1}
+       test_cmp_rev side @{-1}

 '
 
 test_expect_success '@{-1}~2 works' '
 '
 
 test_expect_success '@{-1}~2 works' '

-       test_rev_equivalent side~2 @{-1}~2
+       test_cmp_rev side~2 @{-1}~2

 '
 
 test_expect_success '@{-1}^2 works' '
 '
 
 test_expect_success '@{-1}^2 works' '

-       test_rev_equivalent side^2 @{-1}^2
+       test_cmp_rev side^2 @{-1}^2

 '
 
 test_expect_success '@{-1}@{1} works' '
 '
 
 test_expect_success '@{-1}@{1} works' '

-       test_rev_equivalent side@{1} @{-1}@{1}
+       test_cmp_rev side@{1} @{-1}@{1}

 '
 
 test_expect_success '@{-2} works' '
 '
 
 test_expect_success '@{-2} works' '

-       test_rev_equivalent master @{-2}
+       test_cmp_rev master @{-2}

 '
 
 test_expect_success '@{-3} fails' '
 '
 
 test_expect_success '@{-3} fails' '

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 32fdc9938e1dc29d9a1c6c1dd54379ee33644561..8462be1db6a0fe4f9e28cd1662be604196141055 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -29,12 +29,6 @@ Initial setup:
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
 

-test_cmp_rev () {
-       git rev-parse --verify "$1" >expect.rev &&
-       git rev-parse --verify "$2" >actual.rev &&
-       test_cmp expect.rev actual.rev
-}
-

 set_fake_editor
 
 # WARNING: Modifications to the initial repository can change the SHA ID used
 set_fake_editor
 
 # WARNING: Modifications to the initial repository can change the SHA ID used

diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index c82f7210c4ca10e35d9d2000aa8da2d10194a6c6..223b98433c502b03c4ba70550cb32d42a5f6295b 100755 (executable)
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -11,12 +11,6 @@ test_description='test cherry-pick and revert with conflicts
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-test_cmp_rev () {
-       git rev-parse --verify "$1" >expect.rev &&
-       git rev-parse --verify "$2" >actual.rev &&
-       test_cmp expect.rev actual.rev
-}
-

 pristine_detach () {
        git checkout -f "$1^0" &&
        git read-tree -u --reset HEAD &&
 pristine_detach () {
        git checkout -f "$1^0" &&
        git read-tree -u --reset HEAD &&

diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index 340afc760de030879fff496dca3db8432a6b992b..4e7136b83775946a07678119c7c9897bb0f2b709 100755 (executable)
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@ -5,15 +5,11 @@ test_description='test cherry-picking many commits'
 . ./test-lib.sh
 
 check_head_differs_from() {
 . ./test-lib.sh
 
 check_head_differs_from() {

-       head=$(git rev-parse --verify HEAD) &&
-       arg=$(git rev-parse --verify "$1") &&
-       test "$head" != "$arg"
+       ! test_cmp_rev HEAD "$1"

 }
 
 check_head_equals() {
 }
 
 check_head_equals() {

-       head=$(git rev-parse --verify HEAD) &&
-       arg=$(git rev-parse --verify "$1") &&
-       test "$head" = "$arg"
+       test_cmp_rev HEAD "$1"

 }
 
 test_expect_success setup '
 }
 
 test_expect_success setup '

diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index b5fb527b2e686d158a6e7d53d6246b9e66f80a7b..7b7a89dbd5ce578e0a722345a00f247e383689ef 100755 (executable)
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -24,12 +24,6 @@ pristine_detach () {
        git clean -d -f -f -q -x
 }
 
        git clean -d -f -f -q -x
 }
 

-test_cmp_rev () {
-       git rev-parse --verify "$1" >expect.rev &&
-       git rev-parse --verify "$2" >actual.rev &&
-       test_cmp expect.rev actual.rev
-}
-

 test_expect_success setup '
        git config advice.detachedhead false &&
        echo unrelated >unrelated &&
 test_expect_success setup '
        git config advice.detachedhead false &&
        echo unrelated >unrelated &&

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 72e28ee5350926f3c4f27e2c99f8323a3eb8e57c..3e0e15fb3e0b92ab7e95789d27db34d9a1fa423c 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -676,9 +676,7 @@ test_expect_success 'bisect fails if tree is broken on trial commit' '
 check_same()
 {
        echo "Checking $1 is the same as $2" &&
 check_same()
 {
        echo "Checking $1 is the same as $2" &&

-       git rev-parse "$1" > expected.same &&
-       git rev-parse "$2" > expected.actual &&
-       test_cmp expected.same expected.actual
+       test_cmp_rev "$1" "$2"

 }
 
 test_expect_success 'bisect: --no-checkout - start commit bad' '
 }
 
 test_expect_success 'bisect: --no-checkout - start commit bad' '

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 22a4f8fb64a4e8084139fc148e8e7dd4aa73d684..fa62d010f68e3ee97e6754687ad4d08564d3c96b 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -602,6 +602,13 @@ test_cmp() {
        $GIT_TEST_CMP "$@"
 }
 
        $GIT_TEST_CMP "$@"
 }
 

+# Tests that its two parameters refer to the same revision
+test_cmp_rev () {
+       git rev-parse --verify "$1" >expect.rev &&
+       git rev-parse --verify "$2" >actual.rev &&
+       test_cmp expect.rev actual.rev
+}
+

 # Print a sequence of numbers or letters in increasing order.  This is
 # similar to GNU seq(1), but the latter might not be available
 # everywhere (and does not do letters).  It may be used like:
 # Print a sequence of numbers or letters in increasing order.  This is
 # similar to GNU seq(1), but the latter might not be available
 # everywhere (and does not do letters).  It may be used like: