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
3fe555a7
Commit
3fe555a7
authored
May 04, 2018
by
Kim Carlbäcker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add note about rebase/squash duplication in Gitaly
parent
4cfa8168
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
lib/gitlab/git/repository.rb
lib/gitlab/git/repository.rb
+8
-1
No files found.
lib/gitlab/git/repository.rb
View file @
3fe555a7
...
@@ -20,6 +20,9 @@ module Gitlab
...
@@ -20,6 +20,9 @@ module Gitlab
GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE
GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE
]
.
freeze
]
.
freeze
SEARCH_CONTEXT_LINES
=
3
SEARCH_CONTEXT_LINES
=
3
# In https://gitlab.com/gitlab-org/gitaly/merge_requests/698
# We copied these two prefixes into gitaly-go, so don't change these
# or things will break! (REBASE_WORKTREE_PREFIX and SQUASH_WORKTREE_PREFIX)
REBASE_WORKTREE_PREFIX
=
'rebase'
.
freeze
REBASE_WORKTREE_PREFIX
=
'rebase'
.
freeze
SQUASH_WORKTREE_PREFIX
=
'squash'
.
freeze
SQUASH_WORKTREE_PREFIX
=
'squash'
.
freeze
GITALY_INTERNAL_URL
=
'ssh://gitaly/internal.git'
.
freeze
GITALY_INTERNAL_URL
=
'ssh://gitaly/internal.git'
.
freeze
...
@@ -1671,10 +1674,14 @@ module Gitlab
...
@@ -1671,10 +1674,14 @@ module Gitlab
end
end
end
end
# This function is duplicated in Gitaly-Go, don't change it!
# https://gitlab.com/gitlab-org/gitaly/merge_requests/698
def
fresh_worktree?
(
path
)
def
fresh_worktree?
(
path
)
File
.
exist?
(
path
)
&&
!
clean_stuck_worktree
(
path
)
File
.
exist?
(
path
)
&&
!
clean_stuck_worktree
(
path
)
end
end
# This function is duplicated in Gitaly-Go, don't change it!
# https://gitlab.com/gitlab-org/gitaly/merge_requests/698
def
clean_stuck_worktree
(
path
)
def
clean_stuck_worktree
(
path
)
return
false
unless
File
.
mtime
(
path
)
<
15
.
minutes
.
ago
return
false
unless
File
.
mtime
(
path
)
<
15
.
minutes
.
ago
...
...
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