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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
f5d3bd0e
Commit
f5d3bd0e
authored
8 years ago
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avoid githooks if annex commit is pushed to normal branch
parent
d95c0f5f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
lib/gitlab/git_access.rb
lib/gitlab/git_access.rb
+8
-0
No files found.
lib/gitlab/git_access.rb
View file @
f5d3bd0e
...
...
@@ -213,6 +213,7 @@ module Gitlab
end
commits
.
each
do
|
commit
|
next
if
commit_from_annex_sync?
(
commit
,
ref
)
if
status_object
=
check_commit
(
commit
,
git_hook
)
return
status_object
end
...
...
@@ -364,5 +365,12 @@ module Gitlab
true
end
def
commit_from_annex_sync?
(
rev
,
ref
)
return
false
unless
Gitlab
.
config
.
gitlab_shell
.
git_annex_enabled
# Commit present in synced/current_branch, so avoid checking git hooks on this
project
.
repository
.
branch_names_contains
(
rev
).
contains?
"synced/
#{
ref
}
"
end
end
end
This diff is collapsed.
Click to expand it.
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