From a68a62011d03c15d6116dc1e6dcb9514040a51f5 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 15 Nov 2016 07:53:36 +0800
Subject: [PATCH] Don't pass source_branch if it doesn't exist
---
app/controllers/concerns/creates_commit.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index dacb5679dd3..643b61af1b2 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -4,9 +4,10 @@ module CreatesCommit
def create_commit(service, success_path:, failure_path:, failure_view: nil, success_notice: nil)
set_commit_variables
+ source_branch = @ref if @repository.find_branch(@ref)
commit_params = @commit_params.merge(
source_project: @project,
- source_branch: @ref,
+ source_branch: source_branch,
target_branch: @target_branch
)
--
GitLab