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
Kazuhiko Shiozaki
gitlab-ce
Commits
635f62be
Commit
635f62be
authored
Jan 22, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'stop_popen_zombies'
Conflicts: CHANGELOG
parents
b73170f5
a63187f2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
CHANGELOG
CHANGELOG
+2
-2
doc/development/shell_commands.md
doc/development/shell_commands.md
+1
-1
lib/gitlab/force_push_check.rb
lib/gitlab/force_push_check.rb
+1
-1
No files found.
CHANGELOG
View file @
635f62be
...
@@ -21,7 +21,7 @@ v 7.8.0
...
@@ -21,7 +21,7 @@ v 7.8.0
-
-
-
-
- Upgrade Sidekiq gem to version 3.3.0
- Upgrade Sidekiq gem to version 3.3.0
-
-
Stop git zombie creation during force push check
-
-
-
-
- Fix commits pagination
- Fix commits pagination
...
...
doc/development/shell_commands.md
View file @
635f62be
...
@@ -108,7 +108,7 @@ In other repositories, such as gitlab-shell you can also use `IO.popen`.
...
@@ -108,7 +108,7 @@ In other repositories, such as gitlab-shell you can also use `IO.popen`.
```
ruby
```
ruby
# Safe IO.popen example
# Safe IO.popen example
logs
=
IO
.
popen
(
%W(git log)
,
chdir:
repo_dir
)
.
read
logs
=
IO
.
popen
(
%W(git log)
,
chdir:
repo_dir
)
{
|
p
|
p
.
read
}
```
```
Note that unlike
`Gitlab::Popen.popen`
,
`IO.popen`
does not capture standard error.
Note that unlike
`Gitlab::Popen.popen`
,
`IO.popen`
does not capture standard error.
...
...
lib/gitlab/force_push_check.rb
View file @
635f62be
...
@@ -4,7 +4,7 @@ module Gitlab
...
@@ -4,7 +4,7 @@ module Gitlab
return
false
if
project
.
empty_repo?
return
false
if
project
.
empty_repo?
if
oldrev
!=
Gitlab
::
Git
::
BLANK_SHA
&&
newrev
!=
Gitlab
::
Git
::
BLANK_SHA
if
oldrev
!=
Gitlab
::
Git
::
BLANK_SHA
&&
newrev
!=
Gitlab
::
Git
::
BLANK_SHA
missed_refs
=
IO
.
popen
(
%W(git --git-dir=
#{
project
.
repository
.
path_to_repo
}
rev-list
#{
oldrev
}
^
#{
newrev
}
)
).
read
missed_refs
,
_
=
Gitlab
::
Popen
.
popen
(
%W(git --git-dir=
#{
project
.
repository
.
path_to_repo
}
rev-list
#{
oldrev
}
^
#{
newrev
}
)
)
missed_refs
.
split
(
"
\n
"
).
size
>
0
missed_refs
.
split
(
"
\n
"
).
size
>
0
else
else
false
false
...
...
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