summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-12-06 16:26:40 +0000
committerRobert Speicher <robert@gitlab.com>2017-12-06 16:26:40 +0000
commit67c822342fae6b9dd299371a8c118ec13f9547fb (patch)
tree4d406a1da421e52c56bd78028634bfdbd8d667d0
parent7e81de5ba8fa2aaa13c6035c0e333b4b0ff0df9b (diff)
parent019d491ddfcdc7782335967864a72b360abc1c55 (diff)
downloadgitlab-shell-67c822342fae6b9dd299371a8c118ec13f9547fb.tar.gz
Merge branch 'fork-no-local' into 'master'v5.10.1
Use 'git clone --no-local' when creating a fork See merge request gitlab-org/gitlab-shell!176
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
-rw-r--r--lib/gitlab_projects.rb4
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 37609ac..18edbbd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v5.10.1
+ - Use 'git clone --no-local' when creating a fork (!176)
+
v5.10.0
- Add a 'fork-repository' command that works with hashed storage (!174)
diff --git a/VERSION b/VERSION
index 509b0b6..4e32c7b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.10.0
+5.10.1
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
index ad62cce..6700735 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -385,7 +385,7 @@ class GitlabProjects
FileUtils.mkdir_p(File.dirname(to_path), mode: 0770)
$logger.info "Forking repository from <#{from_path}> to <#{to_path}>."
- cmd = %W(git clone --bare -- #{from_path} #{to_path})
+ cmd = %W(git clone --bare --no-local -- #{from_path} #{to_path})
system(*cmd) && self.class.create_hooks(to_path)
end
@@ -422,7 +422,7 @@ class GitlabProjects
end
$logger.info "Forking project from <#{full_path}> to <#{full_destination_path}>."
- cmd = %W(git clone --bare -- #{full_path} #{full_destination_path})
+ cmd = %W(git clone --bare --no-local -- #{full_path} #{full_destination_path})
system(*cmd) && self.class.create_hooks(full_destination_path)
end