summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-05 13:46:16 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-05 13:46:16 +0000
commitaf88f84247d5e9462f6ab562a96c620d0c7a57d4 (patch)
treeec361a427b1b0d7f9fc615447e2674b8104bc125
parent261cb1fe7c946e034a5f43a03e9da86476eca8f2 (diff)
parent0233e806218c0d3142a28eb9fc888587910635e1 (diff)
downloadgitlab-shell-af88f84247d5e9462f6ab562a96c620d0c7a57d4.tar.gz
Merge branch 'clean_up_fork_and_import' of /home/git/repositories/gitlab/gitlab-shell
-rw-r--r--lib/gitlab_projects.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
index 0354b87..0dd56be 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -94,8 +94,8 @@ class GitlabProjects
def import_project
@source = ARGV.shift
$logger.info "Importing project #{@project_name} from <#{@source}> to <#{full_path}>."
- cmd = %W(git clone --bare #{@source} #{project_name})
- system(*cmd, chdir: repos_path) && create_hooks(full_path)
+ cmd = %W(git clone --bare #{@source} #{full_path})
+ system(*cmd) && create_hooks(full_path)
end
# Move repository from one directory to another
@@ -156,8 +156,8 @@ class GitlabProjects
end
$logger.info "Forking project from <#{full_path}> to <#{full_destination_path}>."
- cmd = %W(git clone --bare #{full_path})
- system(*cmd, chdir: namespaced_path) && create_hooks(full_destination_path)
+ cmd = %W(git clone --bare #{full_path} #{full_destination_path})
+ system(*cmd) && create_hooks(full_destination_path)
end
def update_head