BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
56d131dc
Commit
56d131dc
authored
Dec 14, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ArgumentError error instead because it's a bug
if it happens. Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747933
parent
944a8fa4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
git_operation_service.rb
app/services/git_operation_service.rb
+4
-4
No files found.
app/services/git_operation_service.rb
View file @
56d131dc
...
...
@@ -151,17 +151,17 @@ class GitOperationService
end
unless
source_project
.
repository
.
branch_exists?
(
source_branch_name
)
raise
Repository
::
CommitError
.
new
(
raise
ArgumentError
,
"Cannot find branch
#{
branch_name
}
nor"
\
"
#{
source_branch_name
}
from"
\
"
#{
source_project
.
path_with_namespace
}
"
)
"
#{
source_project
.
path_with_namespace
}
"
end
elsif
source_branch_name
unless
repository
.
branch_exists?
(
source_branch_name
)
raise
Repository
::
CommitError
.
new
(
raise
ArgumentError
,
"Cannot find branch
#{
branch_name
}
nor"
\
"
#{
source_branch_name
}
from"
\
"
#{
repository
.
project
.
path_with_namespace
}
"
)
"
#{
repository
.
project
.
path_with_namespace
}
"
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