Commit 6953fb79 authored by Lin Jen-Shin's avatar Lin Jen-Shin

When no CE branch, find merge-base between CE and HEAD

parent 007ac501
...@@ -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)
......
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