diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rwxr-xr-x | bin/gitlab-projects | 2 | ||||
| -rw-r--r-- | lib/gitlab_projects.rb | 17 | ||||
| -rw-r--r-- | spec/gitlab_projects_spec.rb | 27 |
5 files changed, 1 insertions, 50 deletions
@@ -2,6 +2,7 @@ v3.0.0 - Remove rm-tag command (Robert Schilling) - Remove create-branch and rm-branch commands (Robert Schilling) - Update PostReceive worker so it logs a unique JID in Sidekiq + - Remove update-head command v2.7.2 - Do not prune objects during 'git gc' @@ -100,10 +100,6 @@ Fork repo: ./bin/gitlab-projects fork-project gitlab/gitlab-ci.git randx -Update HEAD: - - ./bin/gitlab-projects update-head gitlab/gitlab-ci.git 3-2-stable - Create tag (lightweight & annotated): ./bin/gitlab-projects create-tag gitlab/gitlab-ci.git v3.0.0 3-0-stable diff --git a/bin/gitlab-projects b/bin/gitlab-projects index c354fe5..22b0022 100755 --- a/bin/gitlab-projects +++ b/bin/gitlab-projects @@ -19,8 +19,6 @@ require_relative '../lib/gitlab_init' # # /bin/gitlab-projects import-project randx/six.git https://github.com/randx/six.git # -# /bin/gitlab-projects update-head gitlab/gitlab-ci.git 5-2-stable -# require File.join(ROOT_PATH, 'lib', 'gitlab_projects') # Return non-zero if command execution was not successful diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb index f0e0773..767ab79 100644 --- a/lib/gitlab_projects.rb +++ b/lib/gitlab_projects.rb @@ -58,7 +58,6 @@ class GitlabProjects when 'import-project'; import_project when 'fork-project'; fork_project when 'fetch-remote'; fetch_remote - when 'update-head'; update_head when 'push-branches'; push_branches when 'delete-remote-branches'; delete_remote_branches when 'list-remote-tags'; list_remote_tags @@ -314,22 +313,6 @@ class GitlabProjects system(*cmd) && self.class.create_hooks(full_destination_path) end - def update_head - new_head = ARGV.shift - - unless new_head - $logger.error "update-head failed: no branch provided." - return false - end - - File.open(File.join(full_path, 'HEAD'), 'w') do |f| - f.write("ref: refs/heads/#{new_head}") - end - - $logger.info "Update head in project #{project_name} to <#{new_head}>." - true - end - def gc $logger.info "Running git gc for <#{full_path}>." unless File.exists?(full_path) diff --git a/spec/gitlab_projects_spec.rb b/spec/gitlab_projects_spec.rb index 47582f3..eeebf87 100644 --- a/spec/gitlab_projects_spec.rb +++ b/spec/gitlab_projects_spec.rb @@ -205,33 +205,6 @@ describe GitlabProjects do end end - describe :update_head do - let(:gl_projects) { build_gitlab_projects('update-head', repo_name, 'stable') } - let(:gl_projects_fail) { build_gitlab_projects 'update-head', repo_name } - - before do - FileUtils.mkdir_p(tmp_repo_path) - system(*%W(git init --bare #{tmp_repo_path})) - FileUtils.touch(File.join(tmp_repo_path, "refs/heads/stable")) - File.read(File.join(tmp_repo_path, 'HEAD')).strip.should == 'ref: refs/heads/master' - end - - it "should update head for repo" do - gl_projects.exec.should be_true - File.read(File.join(tmp_repo_path, 'HEAD')).strip.should == 'ref: refs/heads/stable' - end - - it "should log an update_head event" do - $logger.should_receive(:info).with("Update head in project #{repo_name} to <stable>.") - gl_projects.exec - end - - it "should failed and log an error" do - $logger.should_receive(:error).with("update-head failed: no branch provided.") - gl_projects_fail.exec.should be_false - end - end - describe :import_project do context 'success import' do let(:gl_projects) { build_gitlab_projects('import-project', repo_name, 'https://github.com/randx/six.git') } |