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
992dfd7e
Commit
992dfd7e
authored
May 16, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fetch CE/branch before running `git apply --check --3way patch`
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
3d44ec3f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
lib/gitlab/ee_compat_check.rb
lib/gitlab/ee_compat_check.rb
+5
-3
No files found.
lib/gitlab/ee_compat_check.rb
View file @
992dfd7e
...
@@ -131,10 +131,12 @@ module Gitlab
...
@@ -131,10 +131,12 @@ module Gitlab
def
check_patch
(
patch_path
)
def
check_patch
(
patch_path
)
step
(
"Checking out master"
,
%w[git checkout master]
)
step
(
"Checking out master"
,
%w[git checkout master]
)
step
(
"Resetting to latest master"
,
%w[git reset --hard origin/master]
)
step
(
"Resetting to latest master"
,
%w[git reset --hard origin/master]
)
step
(
"Fetching CE/
#{
branch
}
"
,
%W[git fetch
#{
CE_REPO
}
#{
branch
}
]
)
step
(
step
(
"Checking if
#{
patch_path
}
applies cleanly to EE/master"
,
"Checking if
#{
patch_path
}
applies cleanly to EE/master"
,
%W[git apply --check --3way
#{
patch_path
}
]
%W[git apply --check --3way
#{
patch_path
}
]
)
do
|
output
,
status
|
)
do
|
output
,
status
|
puts
output
unless
status
.
zero?
unless
status
.
zero?
@failed_files
=
output
.
lines
.
reduce
([])
do
|
memo
,
line
|
@failed_files
=
output
.
lines
.
reduce
([])
do
|
memo
,
line
|
if
line
.
start_with?
(
'error: patch failed:'
)
if
line
.
start_with?
(
'error: patch failed:'
)
...
@@ -309,12 +311,12 @@ module Gitlab
...
@@ -309,12 +311,12 @@ module Gitlab
U lib/gitlab/ee_compat_check.rb
U lib/gitlab/ee_compat_check.rb
Resolve them, stage the changes and commit them.
Resolve them, stage the changes and commit them.
If the patch couldn't be applied cleanly, use the following command:
If the patch couldn't be applied cleanly, use the following command:
# In the EE repo
# In the EE repo
$ git apply --reject path/to/
#{
ce_branch
}
.patch
$ git apply --reject path/to/
#{
ce_branch
}
.patch
This option makes git apply the parts of the patch that are applicable,
This option makes git apply the parts of the patch that are applicable,
and leave the rejected hunks in corresponding `.rej` files.
and leave the rejected hunks in corresponding `.rej` files.
You can then resolve the conflicts highlighted in `.rej` by
You can then resolve the conflicts highlighted in `.rej` by
...
...
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