From 11b1ed9873e51c6ce477cbade8e2be2986ad856b Mon Sep 17 00:00:00 2001 From: Stephen Haberman Date: Tue, 11 Nov 2008 16:45:51 -0600 Subject: [PATCH 1/1] Remove the server-/client- prefixes in the tests. --- ...t-msg-trac.sh => t1000-commit-msg-trac.sh} | 0 ...ges.sh => t1001-commit-msg-trac-merges.sh} | 0 ...-rebase.sh => t1100-post-commit-rebase.sh} | 0 ...> t2000-update-ensure-ticket-reference.sh} | 0 ...-update-ensure-ticket-reference-merges.sh} | 0 ...pdate-ensure-ticket-reference-branches.sh} | 0 ...pdate-stable.sh => t2100-update-stable.sh} | 0 ...t2101-update-stable-and-prefer-rebased.sh} | 0 ...te.sh => t2102-update-stable-candidate.sh} | 0 ...e-email.sh => t2200-post-receive-email.sh} | 0 ...gs.sh => t2201-post-receive-email-tags.sh} | 0 ...h => t2202-post-receive-email-branches.sh} | 0 ....sh => t2203-post-receive-email-stable.sh} | 0 ... => t2204-post-receive-email-conflicts.sh} | 0 ...ebase.sh => t2300-update-prefer-rebase.sh} | 0 ...01-update-prefer-rebase-even-if-merges.sh} | 0 tests/t2301b-broken-rebase.sh | 96 ------------------- ... t2302-update-prefer-rebase-new-parent.sh} | 0 ...y-one.sh => t2400-pre-receive-only-one.sh} | 0 ...erged.sh => t2500-update-ensure-merged.sh} | 0 ....sh => t2600-update-prefer-underscores.sh} | 0 ...ure-follows.sh => t2700-ensure-follows.sh} | 0 ...ig.sh => t2800-post-receive-git-config.sh} | 0 ...=> t2801-post-receive-git-config-hooks.sh} | 0 ...ck-check.sh => t2900-update-lock-check.sh} | 0 ...ive-trac.sh => t3000-post-receive-trac.sh} | 0 ...-post-receive-trac-with-commit-numbers.sh} | 0 ...ranch.sh => t3100-ensure-tag-in-branch.sh} | 0 ...200-post-receive-assign-commit-numbers.sh} | 0 29 files changed, 96 deletions(-) rename tests/{t1000-client-commit-msg-trac.sh => t1000-commit-msg-trac.sh} (100%) rename tests/{t1001-client-commit-msg-trac-merges.sh => t1001-commit-msg-trac-merges.sh} (100%) rename tests/{t1100-client-post-commit-rebase.sh => t1100-post-commit-rebase.sh} (100%) rename tests/{t2000-server-update-ensure-ticket-reference.sh => t2000-update-ensure-ticket-reference.sh} (100%) rename tests/{t2001-server-update-ensure-ticket-reference-merges.sh => t2001-update-ensure-ticket-reference-merges.sh} (100%) rename tests/{t2002-server-update-ensure-ticket-reference-branches.sh => t2002-update-ensure-ticket-reference-branches.sh} (100%) rename tests/{t2100-server-update-stable.sh => t2100-update-stable.sh} (100%) rename tests/{t2101-server-update-stable-and-prefer-rebased.sh => t2101-update-stable-and-prefer-rebased.sh} (100%) rename tests/{t2102-server-update-stable-candidate.sh => t2102-update-stable-candidate.sh} (100%) rename tests/{t2200-server-post-receive-email.sh => t2200-post-receive-email.sh} (100%) rename tests/{t2201-server-post-receive-email-tags.sh => t2201-post-receive-email-tags.sh} (100%) rename tests/{t2202-server-post-receive-email-branches.sh => t2202-post-receive-email-branches.sh} (100%) rename tests/{t2203-server-post-receive-email-stable.sh => t2203-post-receive-email-stable.sh} (100%) rename tests/{t2204-server-post-receive-email-conflicts.sh => t2204-post-receive-email-conflicts.sh} (100%) rename tests/{t2300-server-update-prefer-rebase.sh => t2300-update-prefer-rebase.sh} (100%) rename tests/{t2301-server-update-prefer-rebase-even-if-merges.sh => t2301-update-prefer-rebase-even-if-merges.sh} (100%) delete mode 100644 tests/t2301b-broken-rebase.sh rename tests/{t2302-server-update-prefer-rebase-new-parent.sh => t2302-update-prefer-rebase-new-parent.sh} (100%) rename tests/{t2400-server-pre-receive-only-one.sh => t2400-pre-receive-only-one.sh} (100%) rename tests/{t2500-server-update-ensure-merged.sh => t2500-update-ensure-merged.sh} (100%) rename tests/{t2600-server-update-prefer-underscores.sh => t2600-update-prefer-underscores.sh} (100%) rename tests/{t2700-server-ensure-follows.sh => t2700-ensure-follows.sh} (100%) rename tests/{t2800-server-post-receive-git-config.sh => t2800-post-receive-git-config.sh} (100%) rename tests/{t2801-server-post-receive-git-config-hooks.sh => t2801-post-receive-git-config-hooks.sh} (100%) rename tests/{t2900-server-update-lock-check.sh => t2900-update-lock-check.sh} (100%) rename tests/{t3000-server-post-receive-trac.sh => t3000-post-receive-trac.sh} (100%) rename tests/{t3001-server-post-receive-trac-with-commit-numbers.sh => t3001-post-receive-trac-with-commit-numbers.sh} (100%) rename tests/{t3100-server-ensure-tag-in-branch.sh => t3100-ensure-tag-in-branch.sh} (100%) rename tests/{t3200-server-post-receive-assign-commit-numbers.sh => t3200-post-receive-assign-commit-numbers.sh} (100%) diff --git a/tests/t1000-client-commit-msg-trac.sh b/tests/t1000-commit-msg-trac.sh similarity index 100% rename from tests/t1000-client-commit-msg-trac.sh rename to tests/t1000-commit-msg-trac.sh diff --git a/tests/t1001-client-commit-msg-trac-merges.sh b/tests/t1001-commit-msg-trac-merges.sh similarity index 100% rename from tests/t1001-client-commit-msg-trac-merges.sh rename to tests/t1001-commit-msg-trac-merges.sh diff --git a/tests/t1100-client-post-commit-rebase.sh b/tests/t1100-post-commit-rebase.sh similarity index 100% rename from tests/t1100-client-post-commit-rebase.sh rename to tests/t1100-post-commit-rebase.sh diff --git a/tests/t2000-server-update-ensure-ticket-reference.sh b/tests/t2000-update-ensure-ticket-reference.sh similarity index 100% rename from tests/t2000-server-update-ensure-ticket-reference.sh rename to tests/t2000-update-ensure-ticket-reference.sh diff --git a/tests/t2001-server-update-ensure-ticket-reference-merges.sh b/tests/t2001-update-ensure-ticket-reference-merges.sh similarity index 100% rename from tests/t2001-server-update-ensure-ticket-reference-merges.sh rename to tests/t2001-update-ensure-ticket-reference-merges.sh diff --git a/tests/t2002-server-update-ensure-ticket-reference-branches.sh b/tests/t2002-update-ensure-ticket-reference-branches.sh similarity index 100% rename from tests/t2002-server-update-ensure-ticket-reference-branches.sh rename to tests/t2002-update-ensure-ticket-reference-branches.sh diff --git a/tests/t2100-server-update-stable.sh b/tests/t2100-update-stable.sh similarity index 100% rename from tests/t2100-server-update-stable.sh rename to tests/t2100-update-stable.sh diff --git a/tests/t2101-server-update-stable-and-prefer-rebased.sh b/tests/t2101-update-stable-and-prefer-rebased.sh similarity index 100% rename from tests/t2101-server-update-stable-and-prefer-rebased.sh rename to tests/t2101-update-stable-and-prefer-rebased.sh diff --git a/tests/t2102-server-update-stable-candidate.sh b/tests/t2102-update-stable-candidate.sh similarity index 100% rename from tests/t2102-server-update-stable-candidate.sh rename to tests/t2102-update-stable-candidate.sh diff --git a/tests/t2200-server-post-receive-email.sh b/tests/t2200-post-receive-email.sh similarity index 100% rename from tests/t2200-server-post-receive-email.sh rename to tests/t2200-post-receive-email.sh diff --git a/tests/t2201-server-post-receive-email-tags.sh b/tests/t2201-post-receive-email-tags.sh similarity index 100% rename from tests/t2201-server-post-receive-email-tags.sh rename to tests/t2201-post-receive-email-tags.sh diff --git a/tests/t2202-server-post-receive-email-branches.sh b/tests/t2202-post-receive-email-branches.sh similarity index 100% rename from tests/t2202-server-post-receive-email-branches.sh rename to tests/t2202-post-receive-email-branches.sh diff --git a/tests/t2203-server-post-receive-email-stable.sh b/tests/t2203-post-receive-email-stable.sh similarity index 100% rename from tests/t2203-server-post-receive-email-stable.sh rename to tests/t2203-post-receive-email-stable.sh diff --git a/tests/t2204-server-post-receive-email-conflicts.sh b/tests/t2204-post-receive-email-conflicts.sh similarity index 100% rename from tests/t2204-server-post-receive-email-conflicts.sh rename to tests/t2204-post-receive-email-conflicts.sh diff --git a/tests/t2300-server-update-prefer-rebase.sh b/tests/t2300-update-prefer-rebase.sh similarity index 100% rename from tests/t2300-server-update-prefer-rebase.sh rename to tests/t2300-update-prefer-rebase.sh diff --git a/tests/t2301-server-update-prefer-rebase-even-if-merges.sh b/tests/t2301-update-prefer-rebase-even-if-merges.sh similarity index 100% rename from tests/t2301-server-update-prefer-rebase-even-if-merges.sh rename to tests/t2301-update-prefer-rebase-even-if-merges.sh diff --git a/tests/t2301b-broken-rebase.sh b/tests/t2301b-broken-rebase.sh deleted file mode 100644 index 46b8dcf..0000000 --- a/tests/t2301b-broken-rebase.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -test_description='rebase interactive does not rebase' - -. ./test-lib.sh - -test_expect_success 'setup' ' - echo "setup" >a && - git add a && - git commit -m "setup" && - git clone ./. server && - rm -fr server/.git/hooks && - git remote add origin ./server && - git config --add branch.master.remote origin && - git config --add branch.master.merge refs/heads/master && - git fetch && - - git checkout -b stable master && - echo "setup.stable" >a && - git commit -a -m "stable" && - git push origin stable -' -# -# A --C------ <-- origin/stable -# \ | \ -# B -- D -- E -- F <-- origin/topic2 -# \| \ -# g -- h ------- i <-- topic2 -# -# Trying to push F..i -# -# merge-base(F, h) has two options: B and C -# -test_expect_success 'merging in stable with tricky double baserev does not fool the script' ' - # B: start our topic2 branch, and share it - git checkout -b topic2 origin/stable && - git config --add branch.topic2.merge refs/heads/topic2 && - echo "commit B" >a.topic2 && - git add a.topic2 && - git commit -m "commit B created topic2" && - git push origin topic2 && - - # C: now, separately, move ahead stable, and share it - git checkout stable - echo "commit C" >a && - git commit -a -m "commit C moved stable" && - git push origin stable && - - # D: have another client commit (in this case, it is the server, but close enough) moves topic2 - cd server && - git checkout topic2 && - echo "commit D continuing topic2" >a.client2 && - git add a.client2 && - git commit -m "commit D by client2" && - - # E: the same other client merges the moved stable - git merge stable && - - # F: the same other client moves topic2 again - echo "commit F" >a.client2 && - git commit -a -m "commit F by client2" && - F_hash=$(git rev-parse HEAD) && - cd .. && - - # g: now locally merge in the moved stable (even though our topic2 is out of date) - git checkout topic2 && - git merge stable && - g_hash=$(git rev-parse HEAD) && - - # h: advance local topic2 - echo "commit H" >a.topic2 && - git commit -a -m "commit H continues local fork" && - h_hash=$(git rev-parse HEAD) && - - # i: make a new merge commit - git pull --no-rebase && - i_hash=$(git rev-parse HEAD) && - - # Watch merge rejected as something that should get rebased - # ! git push origin topic2 - test "$i_hash $h_hash $F_hash" = "$(git rev-list --parents --no-walk HEAD)" - - # Now fix it the merge by rebasing it - git reset --hard ORIG_HEAD && - GIT_EDITOR=: git rebase -i -p origin/topic2 && - h2_hash=$(git rev-parse HEAD) && - - # Should be: - # test "$h2_hash $F_hash" = "$(git rev-list --parents --no-walk HEAD)" - # But is just: - test "$h_hash $g_hash" = "$(git rev-list --parents --no-walk HEAD)" - # Where did $F_hash go? -' - -test_done - diff --git a/tests/t2302-server-update-prefer-rebase-new-parent.sh b/tests/t2302-update-prefer-rebase-new-parent.sh similarity index 100% rename from tests/t2302-server-update-prefer-rebase-new-parent.sh rename to tests/t2302-update-prefer-rebase-new-parent.sh diff --git a/tests/t2400-server-pre-receive-only-one.sh b/tests/t2400-pre-receive-only-one.sh similarity index 100% rename from tests/t2400-server-pre-receive-only-one.sh rename to tests/t2400-pre-receive-only-one.sh diff --git a/tests/t2500-server-update-ensure-merged.sh b/tests/t2500-update-ensure-merged.sh similarity index 100% rename from tests/t2500-server-update-ensure-merged.sh rename to tests/t2500-update-ensure-merged.sh diff --git a/tests/t2600-server-update-prefer-underscores.sh b/tests/t2600-update-prefer-underscores.sh similarity index 100% rename from tests/t2600-server-update-prefer-underscores.sh rename to tests/t2600-update-prefer-underscores.sh diff --git a/tests/t2700-server-ensure-follows.sh b/tests/t2700-ensure-follows.sh similarity index 100% rename from tests/t2700-server-ensure-follows.sh rename to tests/t2700-ensure-follows.sh diff --git a/tests/t2800-server-post-receive-git-config.sh b/tests/t2800-post-receive-git-config.sh similarity index 100% rename from tests/t2800-server-post-receive-git-config.sh rename to tests/t2800-post-receive-git-config.sh diff --git a/tests/t2801-server-post-receive-git-config-hooks.sh b/tests/t2801-post-receive-git-config-hooks.sh similarity index 100% rename from tests/t2801-server-post-receive-git-config-hooks.sh rename to tests/t2801-post-receive-git-config-hooks.sh diff --git a/tests/t2900-server-update-lock-check.sh b/tests/t2900-update-lock-check.sh similarity index 100% rename from tests/t2900-server-update-lock-check.sh rename to tests/t2900-update-lock-check.sh diff --git a/tests/t3000-server-post-receive-trac.sh b/tests/t3000-post-receive-trac.sh similarity index 100% rename from tests/t3000-server-post-receive-trac.sh rename to tests/t3000-post-receive-trac.sh diff --git a/tests/t3001-server-post-receive-trac-with-commit-numbers.sh b/tests/t3001-post-receive-trac-with-commit-numbers.sh similarity index 100% rename from tests/t3001-server-post-receive-trac-with-commit-numbers.sh rename to tests/t3001-post-receive-trac-with-commit-numbers.sh diff --git a/tests/t3100-server-ensure-tag-in-branch.sh b/tests/t3100-ensure-tag-in-branch.sh similarity index 100% rename from tests/t3100-server-ensure-tag-in-branch.sh rename to tests/t3100-ensure-tag-in-branch.sh diff --git a/tests/t3200-server-post-receive-assign-commit-numbers.sh b/tests/t3200-post-receive-assign-commit-numbers.sh similarity index 100% rename from tests/t3200-server-post-receive-assign-commit-numbers.sh rename to tests/t3200-post-receive-assign-commit-numbers.sh -- 2.20.1