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
30d7b5c3
Commit
30d7b5c3
authored
Nov 15, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the case when it's a whole new branch
parent
8fca786b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
repository.rb
app/models/repository.rb
+2
-3
No files found.
app/models/repository.rb
View file @
30d7b5c3
...
@@ -1128,7 +1128,7 @@ class Repository
...
@@ -1128,7 +1128,7 @@ class Repository
raise
CommitError
.
new
(
'Failed to create commit'
)
raise
CommitError
.
new
(
'Failed to create commit'
)
end
end
if
rugged
.
lookup
(
newrev
).
parent_ids
.
empty?
if
rugged
.
lookup
(
newrev
).
parent_ids
.
empty?
||
target_branch
.
nil?
oldrev
=
Gitlab
::
Git
::
BLANK_SHA
oldrev
=
Gitlab
::
Git
::
BLANK_SHA
else
else
oldrev
=
rugged
.
merge_base
(
newrev
,
target_branch
.
dereferenced_target
.
sha
)
oldrev
=
rugged
.
merge_base
(
newrev
,
target_branch
.
dereferenced_target
.
sha
)
...
@@ -1219,8 +1219,7 @@ class Repository
...
@@ -1219,8 +1219,7 @@ class Repository
[
find_branch
(
branch_name
),
true
]
[
find_branch
(
branch_name
),
true
]
else
else
raise
CommitError
.
new
(
[
nil
,
true
]
# Empty branch
"Cannot find branch
#{
branch_name
}
and source_branch is not set"
)
end
end
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