Make test case numbers unique

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t2104-update-index-gitfile.sh b/t/t2104-update-index-gitfile.sh
deleted file mode 100755 (executable)
index 641607d..0000000
--- a/t/t2104-update-index-gitfile.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2010 Brad King
-#
-
-test_description='git update-index for gitlink to .git file.
-'
-
-. ./test-lib.sh
-
-test_expect_success 'submodule with absolute .git file' '
-       mkdir sub1 &&
-       (cd sub1 &&
-        git init &&
-        REAL="$(pwd)/.real" &&
-        mv .git "$REAL"
-        echo "gitdir: $REAL" >.git &&
-        test_commit first)
-'
-
-test_expect_success 'add gitlink to absolute .git file' '
-       git update-index --add -- sub1
-'
-
-test_expect_success 'submodule with relative .git file' '
-       mkdir sub2 &&
-       (cd sub2 &&
-        git init &&
-        mv .git .real &&
-        echo "gitdir: .real" >.git &&
-        test_commit first)
-'
-
-test_expect_success 'add gitlink to relative .git file' '
-       git update-index --add -- sub2
-'
-
-test_done

diff --git a/t/t2105-update-index-gitfile.sh b/t/t2105-update-index-gitfile.sh
new file mode 100755 (executable)
index 0000000..641607d
--- /dev/null
+++ b/t/t2105-update-index-gitfile.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Copyright (c) 2010 Brad King
+#
+
+test_description='git update-index for gitlink to .git file.
+'
+
+. ./test-lib.sh
+
+test_expect_success 'submodule with absolute .git file' '
+       mkdir sub1 &&
+       (cd sub1 &&
+        git init &&
+        REAL="$(pwd)/.real" &&
+        mv .git "$REAL"
+        echo "gitdir: $REAL" >.git &&
+        test_commit first)
+'
+
+test_expect_success 'add gitlink to absolute .git file' '
+       git update-index --add -- sub1
+'
+
+test_expect_success 'submodule with relative .git file' '
+       mkdir sub2 &&
+       (cd sub2 &&
+        git init &&
+        mv .git .real &&
+        echo "gitdir: .real" >.git &&
+        test_commit first)
+'
+
+test_expect_success 'add gitlink to relative .git file' '
+       git update-index --add -- sub2
+'
+
+test_done

diff --git a/t/t3415-rebase-onto-threedots.sh b/t/t3415-rebase-onto-threedots.sh
deleted file mode 100755 (executable)
index ddf2f64..0000000
--- a/t/t3415-rebase-onto-threedots.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-test_description='git rebase --onto A...B'
-
-. ./test-lib.sh
-. "$TEST_DIRECTORY/lib-rebase.sh"
-
-# Rebase only the tip commit of "topic" on merge base between "master"
-# and "topic".  Cannot do this for "side" with "master" because there
-# is no single merge base.
-#
-#
-#          F---G topic                             G'
-#         /                                       /
-# A---B---C---D---E master      -->       A---B---C---D---E
-#      \   \ /
-#      \   x
-#       \ / \
-#        H---I---J---K side
-
-test_expect_success setup '
-       test_commit A &&
-       test_commit B &&
-       git branch side &&
-       test_commit C &&
-       git branch topic &&
-       git checkout side &&
-       test_commit H &&
-       git checkout master &&
-       test_tick &&
-       git merge H &&
-       git tag D &&
-       test_commit E &&
-       git checkout topic &&
-       test_commit F &&
-       test_commit G &&
-       git checkout side &&
-       test_tick &&
-       git merge C &&
-       git tag I &&
-       test_commit J &&
-       test_commit K
-'
-
-test_expect_success 'rebase --onto master...topic' '
-       git reset --hard &&
-       git checkout topic &&
-       git reset --hard G &&
-
-       git rebase --onto master...topic F &&
-       git rev-parse HEAD^1 >actual &&
-       git rev-parse C^0 >expect &&
-       test_cmp expect actual
-'
-
-test_expect_success 'rebase --onto master...' '
-       git reset --hard &&
-       git checkout topic &&
-       git reset --hard G &&
-
-       git rebase --onto master... F &&
-       git rev-parse HEAD^1 >actual &&
-       git rev-parse C^0 >expect &&
-       test_cmp expect actual
-'
-
-test_expect_success 'rebase --onto master...side' '
-       git reset --hard &&
-       git checkout side &&
-       git reset --hard K &&
-
-       test_must_fail git rebase --onto master...side J
-'
-
-test_expect_success 'rebase -i --onto master...topic' '
-       git reset --hard &&
-       git checkout topic &&
-       git reset --hard G &&
-       set_fake_editor &&
-       EXPECT_COUNT=1 git rebase -i --onto master...topic F &&
-       git rev-parse HEAD^1 >actual &&
-       git rev-parse C^0 >expect &&
-       test_cmp expect actual
-'
-
-test_expect_success 'rebase -i --onto master...' '
-       git reset --hard &&
-       git checkout topic &&
-       git reset --hard G &&
-       set_fake_editor &&
-       EXPECT_COUNT=1 git rebase -i --onto master... F &&
-       git rev-parse HEAD^1 >actual &&
-       git rev-parse C^0 >expect &&
-       test_cmp expect actual
-'
-
-test_expect_success 'rebase -i --onto master...side' '
-       git reset --hard &&
-       git checkout side &&
-       git reset --hard K &&
-
-       test_must_fail git rebase -i --onto master...side J
-'
-
-test_done

diff --git a/t/t3416-rebase-onto-threedots.sh b/t/t3416-rebase-onto-threedots.sh
new file mode 100755 (executable)
index 0000000..ddf2f64
--- /dev/null
+++ b/t/t3416-rebase-onto-threedots.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+test_description='git rebase --onto A...B'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-rebase.sh"
+
+# Rebase only the tip commit of "topic" on merge base between "master"
+# and "topic".  Cannot do this for "side" with "master" because there
+# is no single merge base.
+#
+#
+#          F---G topic                             G'
+#         /                                       /
+# A---B---C---D---E master      -->       A---B---C---D---E
+#      \   \ /
+#      \   x
+#       \ / \
+#        H---I---J---K side
+
+test_expect_success setup '
+       test_commit A &&
+       test_commit B &&
+       git branch side &&
+       test_commit C &&
+       git branch topic &&
+       git checkout side &&
+       test_commit H &&
+       git checkout master &&
+       test_tick &&
+       git merge H &&
+       git tag D &&
+       test_commit E &&
+       git checkout topic &&
+       test_commit F &&
+       test_commit G &&
+       git checkout side &&
+       test_tick &&
+       git merge C &&
+       git tag I &&
+       test_commit J &&
+       test_commit K
+'
+
+test_expect_success 'rebase --onto master...topic' '
+       git reset --hard &&
+       git checkout topic &&
+       git reset --hard G &&
+
+       git rebase --onto master...topic F &&
+       git rev-parse HEAD^1 >actual &&
+       git rev-parse C^0 >expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'rebase --onto master...' '
+       git reset --hard &&
+       git checkout topic &&
+       git reset --hard G &&
+
+       git rebase --onto master... F &&
+       git rev-parse HEAD^1 >actual &&
+       git rev-parse C^0 >expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'rebase --onto master...side' '
+       git reset --hard &&
+       git checkout side &&
+       git reset --hard K &&
+
+       test_must_fail git rebase --onto master...side J
+'
+
+test_expect_success 'rebase -i --onto master...topic' '
+       git reset --hard &&
+       git checkout topic &&
+       git reset --hard G &&
+       set_fake_editor &&
+       EXPECT_COUNT=1 git rebase -i --onto master...topic F &&
+       git rev-parse HEAD^1 >actual &&
+       git rev-parse C^0 >expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'rebase -i --onto master...' '
+       git reset --hard &&
+       git checkout topic &&
+       git reset --hard G &&
+       set_fake_editor &&
+       EXPECT_COUNT=1 git rebase -i --onto master... F &&
+       git rev-parse HEAD^1 >actual &&
+       git rev-parse C^0 >expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'rebase -i --onto master...side' '
+       git reset --hard &&
+       git checkout side &&
+       git reset --hard K &&
+
+       test_must_fail git rebase -i --onto master...side J
+'
+
+test_done