Commit e52096b4 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '6890-just-pick-the-ce-merge-base' into 'master'

Resolve "ee-specific-check checked against the wrong base when there's no CE branch"

Closes #6890

See merge request gitlab-org/gitlab-ee!6594
parents d714754e ded095be
...@@ -79,7 +79,7 @@ module EESpecificCheck ...@@ -79,7 +79,7 @@ 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
say("No CE branch found, using merge base directly") say("No CE branch found, using merge base directly")
run_git_command("merge-base #{ce_merge_base} HEAD") ce_merge_base
elsif ce_fetch_base == ce_merge_base # Up-to-date, no rebase needed elsif ce_fetch_base == ce_merge_base # Up-to-date, no rebase needed
say("EE is up-to-date with CE, using #{ce_fetch_head} directly") say("EE is up-to-date with CE, using #{ce_fetch_head} directly")
ce_fetch_head ce_fetch_head
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment