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
6220bdbb
Commit
6220bdbb
authored
Jul 02, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make it more verbose and fix the case when
CE branch is up-to-date.
parent
16872448
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
scripts/ee_specific_check/ee_specific_check.rb
scripts/ee_specific_check/ee_specific_check.rb
+7
-3
No files found.
scripts/ee_specific_check/ee_specific_check.rb
View file @
6220bdbb
...
...
@@ -62,9 +62,11 @@ module EESpecificCheck
end
def
find_ce_compare_head
(
ce_fetch_head
,
ce_fetch_base
,
ce_merge_base
)
if
git_ancestor?
(
ce_merge_base
,
ce_fetch_base
)
# CE ahead of EE
if
git_ancestor?
(
ce_merge_base
,
ce_fetch_base
)
say
(
"CE is ahead of EE, finding backward CE head"
)
find_backward_ce_head
(
ce_fetch_head
,
ce_fetch_base
,
ce_merge_base
)
else
# EE ahead of CE
else
say
(
"CE is behind of EE, finding forward CE head"
)
find_forward_ce_head
(
ce_merge_base
,
ce_fetch_head
)
end
end
...
...
@@ -77,14 +79,16 @@ module EESpecificCheck
def
find_backward_ce_head
(
ce_fetch_head
,
ce_fetch_base
,
ce_merge_base
)
if
ce_fetch_head
.
start_with?
(
'canonical-ce'
)
||
# No specific CE branch
ce_fetch_base
==
ce_merge_base
# Up-to-date, no rebase needed
say
(
"CE is up-to-date, using
#{
ce_fetch_head
}
directly"
)
ce_merge_base
else
# Rebase CE to remove commits in CE haven't merged into EE
say
(
"Performing rebase to remove commits in CE haven't merged into EE"
)
checkout_and_rebase
(
ce_merge_base
,
ce_fetch_base
,
ce_fetch_head
)
end
end
def
find_forward_ce_head
(
ce_merge_base
,
ce_fetch_head
)
say
(
"Performing merge with CE master for CE branch
#{
ce_fetch_head
}
"
)
with_detached_head
(
ce_fetch_head
)
do
run_git_command
(
"merge
#{
ce_merge_base
}
-s recursive -X patience"
)
...
...
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