Changeset 782 for git/branches/dmik/t/t6019-rev-list-ancestry-path.sh

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• t/t6019-rev-list-ancestry-path.sh (modified) (2 diffs)

git/branches/dmik/t/t6019-rev-list-ancestry-path.sh ¶

@@ -14 +14 @@
 #  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
+#
+#  G..M -- G.t                 == [nothing - was dropped in "-s ours" merge L]
+#  --ancestry-path G..M -- G.t == L
+#  --ancestry-path --simplify-merges G^..M -- G.t == G L
 
 . ./test-lib.sh
@@ -64 +71 @@
 '
 
-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_success '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
+'
+
+# G.t is dropped in an "-s ours" merge
+test_expect_success 'rev-list G..M -- G.t' '
+        >expect &&
+        git rev-list --format=%s G..M -- G.t |
+        sed -e "/^commit /d" >actual &&
+        test_cmp expect actual
+'
+
+test_expect_success 'rev-list --ancestry-path G..M -- G.t' '
+        echo L >expect &&
+        git rev-list --ancestry-path --format=%s G..M -- G.t |
+        sed -e "/^commit /d" >actual &&
+        test_cmp expect actual
+'
+
+test_expect_success 'rev-list --ancestry-path --simplify-merges G^..M -- G.t' '
+        for c in G L; do echo $c; done >expect &&
+        git rev-list --ancestry-path --simplify-merges --format=%s G^..M -- G.t |
+        sed -e "/^commit /d" |
+        sort >actual &&
         test_cmp expect actual
 '