From 1e0cb5ffa68fc6c80ae178141b77c8df739487ce Mon Sep 17 00:00:00 2001 From: Stephen Haberman Date: Wed, 12 Nov 2008 00:17:52 -0600 Subject: [PATCH] Drop dashes for post-receive-commitnumbers and post-receive-gitconfig. --- README.markdown | 4 ++-- ...e-assign-commit-numbers => post-receive-commitnumbers} | 0 .../{post-receive-git-config => post-receive-gitconfig} | 0 ...eive-git-config.sh => t2800-post-receive-gitconfig.sh} | 8 ++++---- ...fig-hooks.sh => t2801-post-receive-gitconfig-hooks.sh} | 6 +++--- ...s.sh => t3001-post-receive-trac-with-commitnumbers.sh} | 2 +- ...mit-numbers.sh => t3200-post-receive-commitnumbers.sh} | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) rename server/{post-receive-assign-commit-numbers => post-receive-commitnumbers} (100%) rename server/{post-receive-git-config => post-receive-gitconfig} (100%) rename tests/{t2800-post-receive-git-config.sh => t2800-post-receive-gitconfig.sh} (74%) rename tests/{t2801-post-receive-git-config-hooks.sh => t2801-post-receive-gitconfig-hooks.sh} (89%) rename tests/{t3001-post-receive-trac-with-commit-numbers.sh => t3001-post-receive-trac-with-commitnumbers.sh} (96%) rename tests/{t3200-post-receive-assign-commit-numbers.sh => t3200-post-receive-commitnumbers.sh} (88%) diff --git a/README.markdown b/README.markdown index d42a5a4..86436a9 100644 --- a/README.markdown +++ b/README.markdown @@ -20,7 +20,7 @@ Server-side Hooks See the individual scripts for documentation, but an overview: -* [post-receive-assign-commitnumbers][1]: makes Subversion-like monotonically increasing commit numbers for every commit +* [post-receive-commitnumbers][1]: makes Subversion-like monotonically increasing commit numbers for every commit * [post-receive-email][2]: contrib email script with customizations for stuff like combined diffs * [post-receive-gitconfig][3]: auto-updates the git config+hooks on the server when updated in the repo * [post-receive-hudson][4]: auto-creates new jobs in Hudson when branches in git are created @@ -31,7 +31,7 @@ See the individual scripts for documentation, but an overview: * [update-lock-check][9]: enforces locked/preserved branches * [update-stable][10]: enforces proper movement of stable -[1]: master/server/post-receive-assign-commitnumbers +[1]: master/server/post-receive-commitnumbers [2]: master/server/post-receive-email [3]: master/server/post-receive-gitconfig [4]: master/server/post-receive-hudson diff --git a/server/post-receive-assign-commit-numbers b/server/post-receive-commitnumbers similarity index 100% rename from server/post-receive-assign-commit-numbers rename to server/post-receive-commitnumbers diff --git a/server/post-receive-git-config b/server/post-receive-gitconfig similarity index 100% rename from server/post-receive-git-config rename to server/post-receive-gitconfig diff --git a/tests/t2800-post-receive-git-config.sh b/tests/t2800-post-receive-gitconfig.sh similarity index 74% rename from tests/t2800-post-receive-git-config.sh rename to tests/t2800-post-receive-gitconfig.sh index 63d1f98..75eae1f 100644 --- a/tests/t2800-post-receive-git-config.sh +++ b/tests/t2800-post-receive-gitconfig.sh @@ -11,19 +11,19 @@ test_expect_success '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 config branch.master.remote origin && + git config branch.master.merge refs/heads/master && git fetch ' -install_post_receive_hook 'post-receive-git-config' +install_post_receive_hook 'post-receive-gitconfig' test_expect_success 'pushing initial value works' ' cd server && ! git config --list | grep foo && cd .. && - ../../scripts/make-gitconfig-branch && + ../../scripts/create-gitconfig && git checkout gitconfig && echo "foo.foo=bar" > config && git commit -a -m "Set foo.foo=bar." diff --git a/tests/t2801-post-receive-git-config-hooks.sh b/tests/t2801-post-receive-gitconfig-hooks.sh similarity index 89% rename from tests/t2801-post-receive-git-config-hooks.sh rename to tests/t2801-post-receive-gitconfig-hooks.sh index e0c0057..464f262 100644 --- a/tests/t2801-post-receive-git-config-hooks.sh +++ b/tests/t2801-post-receive-gitconfig-hooks.sh @@ -13,17 +13,17 @@ test_expect_success 'setup' ' git remote add origin ./server ' -install_post_receive_hook 'post-receive-git-config' +install_post_receive_hook 'post-receive-gitconfig' test_expect_success 'adding hook' ' ls server/.git/hooks | grep post-receive && - ../../scripts/make-gitconfig-branch && + ../../scripts/create-gitconfig && git checkout gitconfig && mkdir hooks && cd hooks && echo "#!/bin/sh" > post-receive && - echo "../../../../server/post-receive-git-config" >> post-receive && + echo "../../../../server/post-receive-gitconfig" >> post-receive && echo "echo barbar" >> post-receive && echo "#!/bin/sh" > update && echo "echo foofoo" >> update && diff --git a/tests/t3001-post-receive-trac-with-commit-numbers.sh b/tests/t3001-post-receive-trac-with-commitnumbers.sh similarity index 96% rename from tests/t3001-post-receive-trac-with-commit-numbers.sh rename to tests/t3001-post-receive-trac-with-commitnumbers.sh index b4e5d65..8a337d4 100644 --- a/tests/t3001-post-receive-trac-with-commit-numbers.sh +++ b/tests/t3001-post-receive-trac-with-commitnumbers.sh @@ -16,7 +16,7 @@ test_expect_success 'setup' ' git remote add origin ./server ' -install_post_receive_hook 'post-receive-assign-commit-numbers' 'post-receive-trac' +install_post_receive_hook 'post-receive-commitnumbers' 'post-receive-trac' test_expect_success 'new branch' ' git checkout -b topic1 master && diff --git a/tests/t3200-post-receive-assign-commit-numbers.sh b/tests/t3200-post-receive-commitnumbers.sh similarity index 88% rename from tests/t3200-post-receive-assign-commit-numbers.sh rename to tests/t3200-post-receive-commitnumbers.sh index 013b3c5..985aadc 100644 --- a/tests/t3200-post-receive-assign-commit-numbers.sh +++ b/tests/t3200-post-receive-commitnumbers.sh @@ -11,12 +11,12 @@ test_expect_success '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 config branch.master.remote origin && + git config branch.master.merge refs/heads/master && git fetch ' -install_post_receive_hook 'post-receive-assign-commit-numbers' +install_post_receive_hook 'post-receive-commitnumbers' test_expect_success 'assign one new commit' ' git checkout master && -- 2.39.5