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
Tatuya Kamada
gitlab-ce
Commits
501ce37f
Commit
501ce37f
authored
Jul 18, 2016
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
parent
a27212ab
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
59 deletions
+43
-59
CHANGELOG
CHANGELOG
+2
-0
app/models/repository.rb
app/models/repository.rb
+28
-44
app/services/create_branch_service.rb
app/services/create_branch_service.rb
+13
-15
No files found.
CHANGELOG
View file @
501ce37f
Please view this file on the master branch, on stable branches it's out of date.
Please view this file on the master branch, on stable branches it's out of date.
v 8.11.0 (unreleased)
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
v 8.10.0 (unreleased)
v 8.10.0 (unreleased)
- Fix profile activity heatmap to show correct day name (eanplatter)
- Fix profile activity heatmap to show correct day name (eanplatter)
...
...
app/models/repository.rb
View file @
501ce37f
...
@@ -704,6 +704,7 @@ class Repository
...
@@ -704,6 +704,7 @@ class Repository
options
[
:commit
]
=
{
options
[
:commit
]
=
{
message:
message
,
message:
message
,
branch:
ref
,
branch:
ref
,
update_ref:
false
,
}
}
raw_repository
.
mkdir
(
path
,
options
)
raw_repository
.
mkdir
(
path
,
options
)
...
@@ -719,6 +720,7 @@ class Repository
...
@@ -719,6 +720,7 @@ class Repository
options
[
:commit
]
=
{
options
[
:commit
]
=
{
message:
message
,
message:
message
,
branch:
ref
,
branch:
ref
,
update_ref:
false
,
}
}
options
[
:file
]
=
{
options
[
:file
]
=
{
...
@@ -739,7 +741,8 @@ class Repository
...
@@ -739,7 +741,8 @@ class Repository
options
[
:author
]
=
committer
options
[
:author
]
=
committer
options
[
:commit
]
=
{
options
[
:commit
]
=
{
message:
message
,
message:
message
,
branch:
ref
branch:
ref
,
update_ref:
false
,
}
}
options
[
:file
]
=
{
options
[
:file
]
=
{
...
@@ -779,11 +782,10 @@ class Repository
...
@@ -779,11 +782,10 @@ class Repository
merge_index
=
rugged
.
merge_commits
(
our_commit
,
their_commit
)
merge_index
=
rugged
.
merge_commits
(
our_commit
,
their_commit
)
return
false
if
merge_index
.
conflicts?
return
false
if
merge_index
.
conflicts?
commit_with_hooks
(
user
,
merge_request
.
target_branch
)
do
|
tmp_ref
|
commit_with_hooks
(
user
,
merge_request
.
target_branch
)
do
actual_options
=
options
.
merge
(
actual_options
=
options
.
merge
(
parents:
[
our_commit
,
their_commit
],
parents:
[
our_commit
,
their_commit
],
tree:
merge_index
.
write_tree
(
rugged
),
tree:
merge_index
.
write_tree
(
rugged
),
update_ref:
tmp_ref
)
)
commit_id
=
Rugged
::
Commit
.
create
(
rugged
,
actual_options
)
commit_id
=
Rugged
::
Commit
.
create
(
rugged
,
actual_options
)
...
@@ -798,15 +800,14 @@ class Repository
...
@@ -798,15 +800,14 @@ class Repository
return
false
unless
revert_tree_id
return
false
unless
revert_tree_id
commit_with_hooks
(
user
,
base_branch
)
do
|
ref
|
commit_with_hooks
(
user
,
base_branch
)
do
committer
=
user_to_committer
(
user
)
committer
=
user_to_committer
(
user
)
source_sha
=
Rugged
::
Commit
.
create
(
rugged
,
source_sha
=
Rugged
::
Commit
.
create
(
rugged
,
message:
commit
.
revert_message
,
message:
commit
.
revert_message
,
author:
committer
,
author:
committer
,
committer:
committer
,
committer:
committer
,
tree:
revert_tree_id
,
tree:
revert_tree_id
,
parents:
[
rugged
.
lookup
(
source_sha
)],
parents:
[
rugged
.
lookup
(
source_sha
)])
update_ref:
ref
)
end
end
end
end
...
@@ -816,7 +817,7 @@ class Repository
...
@@ -816,7 +817,7 @@ class Repository
return
false
unless
cherry_pick_tree_id
return
false
unless
cherry_pick_tree_id
commit_with_hooks
(
user
,
base_branch
)
do
|
ref
|
commit_with_hooks
(
user
,
base_branch
)
do
committer
=
user_to_committer
(
user
)
committer
=
user_to_committer
(
user
)
source_sha
=
Rugged
::
Commit
.
create
(
rugged
,
source_sha
=
Rugged
::
Commit
.
create
(
rugged
,
message:
commit
.
message
,
message:
commit
.
message
,
...
@@ -827,8 +828,7 @@ class Repository
...
@@ -827,8 +828,7 @@ class Repository
},
},
committer:
committer
,
committer:
committer
,
tree:
cherry_pick_tree_id
,
tree:
cherry_pick_tree_id
,
parents:
[
rugged
.
lookup
(
source_sha
)],
parents:
[
rugged
.
lookup
(
source_sha
)])
update_ref:
ref
)
end
end
end
end
...
@@ -929,20 +929,6 @@ class Repository
...
@@ -929,20 +929,6 @@ class Repository
Gitlab
::
Popen
.
popen
(
args
,
path_to_repo
)
Gitlab
::
Popen
.
popen
(
args
,
path_to_repo
)
end
end
def
with_tmp_ref
(
oldrev
=
nil
)
random_string
=
SecureRandom
.
hex
tmp_ref
=
"refs/tmp/
#{
random_string
}
/head"
if
oldrev
&&
!
Gitlab
::
Git
.
blank_ref?
(
oldrev
)
rugged
.
references
.
create
(
tmp_ref
,
oldrev
)
end
# Make commit in tmp ref
yield
(
tmp_ref
)
ensure
rugged
.
references
.
delete
(
tmp_ref
)
rescue
nil
end
def
commit_with_hooks
(
current_user
,
branch
)
def
commit_with_hooks
(
current_user
,
branch
)
update_autocrlf_option
update_autocrlf_option
...
@@ -955,9 +941,8 @@ class Repository
...
@@ -955,9 +941,8 @@ class Repository
oldrev
=
target_branch
.
target
oldrev
=
target_branch
.
target
end
end
with_tmp_ref
(
oldrev
)
do
|
tmp_ref
|
# Make commit
# Make commit in tmp ref
newrev
=
yield
(
ref
)
newrev
=
yield
(
tmp_ref
)
unless
newrev
unless
newrev
raise
CommitError
.
new
(
'Failed to create commit'
)
raise
CommitError
.
new
(
'Failed to create commit'
)
...
@@ -982,7 +967,6 @@ class Repository
...
@@ -982,7 +967,6 @@ class Repository
newrev
newrev
end
end
end
def
ls_files
(
ref
)
def
ls_files
(
ref
)
actual_ref
=
ref
||
root_ref
actual_ref
=
ref
||
root_ref
...
...
app/services/create_branch_service.rb
View file @
501ce37f
...
@@ -15,20 +15,18 @@ class CreateBranchService < BaseService
...
@@ -15,20 +15,18 @@ class CreateBranchService < BaseService
return
error
(
'Branch already exists'
)
return
error
(
'Branch already exists'
)
end
end
new_branch
=
nil
new_branch
=
if
source_project
!=
@project
if
source_project
!=
@project
repository
.
with_tmp_ref
do
|
tmp_ref
|
repository
.
fetch_ref
(
repository
.
fetch_ref
(
source_project
.
repository
.
path_to_repo
,
source_project
.
repository
.
path_to_repo
,
"refs/heads/
#{
ref
}
"
,
"refs/heads/
#{
ref
}
"
,
tmp_ref
"refs/heads/
#{
branch_name
}
"
)
)
new_branch
=
repository
.
add_branch
(
current_user
,
branch_name
,
tmp_ref
)
repository
.
after_create_branch
end
repository
.
find_branch
(
branch_name
)
else
else
new_branch
=
repository
.
add_branch
(
current_user
,
branch_name
,
ref
)
repository
.
add_branch
(
current_user
,
branch_name
,
ref
)
end
end
if
new_branch
if
new_branch
...
...
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