Commit 275492c7 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Rebase takes old base as the one commit before it

This is well explained in:
https://content.pivotal.io/blog/git-rebase-onto
parent 9daa737b
......@@ -98,7 +98,8 @@ module EESpecificCheck
# where ce_merge_base..ee_merge_base is the update-to-date
# CE/EE difference and ce_fetch_head..HEAD is the changes we made in
# CE and EE branches.
run_git_command("rebase --onto #{ce_merge_base} canonical-ce/master #{ce_fetch_head}")
old_base = run_git_command("merge-base canonical-ce/master #{ce_fetch_head}")
run_git_command("rebase --onto #{ce_merge_base} #{old_base}~1 #{ce_fetch_head}")
status = git_status
......
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