Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
23032467
Commit
23032467
authored
Dec 08, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
source_branch -> source_branch_name
parent
3fa3fcd7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
app/services/git_operation_service.rb
app/services/git_operation_service.rb
+9
-8
No files found.
app/services/git_operation_service.rb
View file @
23032467
...
@@ -134,27 +134,28 @@ GitOperationService = Struct.new(:user, :repository) do
...
@@ -134,27 +134,28 @@ GitOperationService = Struct.new(:user, :repository) do
end
end
end
end
def
check_with_branch_arguments!
(
branch_name
,
source_branch
,
source_project
)
def
check_with_branch_arguments!
(
branch_name
,
source_branch_name
,
source_project
)
return
if
repository
.
branch_exists?
(
branch_name
)
return
if
repository
.
branch_exists?
(
branch_name
)
if
repository
.
project
!=
source_project
if
repository
.
project
!=
source_project
unless
source_branch
unless
source_branch
_name
raise
ArgumentError
,
raise
ArgumentError
,
'Should also pass :source_branch if'
+
'Should also pass :source_branch
_name
if'
+
' :source_project is different from current project'
' :source_project is different from current project'
end
end
unless
source_project
.
repository
.
commit
(
source_branch
).
try
(
:sha
)
unless
source_project
.
repository
.
commit
(
source_branch
_name
).
try
(
:sha
)
raise
Repository
::
CommitError
.
new
(
raise
Repository
::
CommitError
.
new
(
"Cannot find branch
#{
branch_name
}
nor"
\
"Cannot find branch
#{
branch_name
}
nor"
\
"
#{
source_branch
}
from"
\
"
#{
source_branch
_name
}
from"
\
"
#{
source_project
.
path_with_namespace
}
"
)
"
#{
source_project
.
path_with_namespace
}
"
)
end
end
elsif
source_branch
elsif
source_branch
_name
unless
repository
.
commit
(
source_branch
).
try
(
:sha
)
unless
repository
.
commit
(
source_branch
_name
).
try
(
:sha
)
raise
Repository
::
CommitError
.
new
(
raise
Repository
::
CommitError
.
new
(
"Cannot find branch
#{
branch_name
}
nor"
\
"Cannot find branch
#{
branch_name
}
nor"
\
"
#{
source_branch
}
from"
\
"
#{
source_branch
_name
}
from"
\
"
#{
repository
.
project
.
path_with_namespace
}
"
)
"
#{
repository
.
project
.
path_with_namespace
}
"
)
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment