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
6953fb79
Commit
6953fb79
authored
Jul 05, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
When no CE branch, find merge-base between CE and HEAD
parent
007ac501
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
scripts/ee_specific_check/ee_specific_check.rb
scripts/ee_specific_check/ee_specific_check.rb
+2
-2
No files found.
scripts/ee_specific_check/ee_specific_check.rb
View file @
6953fb79
...
@@ -79,8 +79,8 @@ module EESpecificCheck
...
@@ -79,8 +79,8 @@ module EESpecificCheck
def
find_backward_ce_head
(
ce_fetch_head
,
ce_fetch_base
,
ce_merge_base
)
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
if
ce_fetch_head
.
start_with?
(
'canonical-ce'
)
||
# No specific CE branch
ce_fetch_base
==
ce_merge_base
# Up-to-date, no rebase needed
ce_fetch_base
==
ce_merge_base
# Up-to-date, no rebase needed
say
(
"CE is up-to-date, using
#{
ce_fetch_head
}
directly"
)
say
(
"CE is up-to-date, using
merge-base
directly"
)
ce_merge_base
run_git_command
(
"merge-base
#{
ce_merge_base
}
HEAD"
)
else
else
say
(
"Performing rebase 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
)
checkout_and_rebase
(
ce_merge_base
,
ce_fetch_base
,
ce_fetch_head
)
...
...
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