1#!/bin/sh 2# 3# Copyright (c) 2019 Denton Liu 4# 5 6test_description='git rebase --fork-point test' 7 8. ./test-lib.sh 9 10# A---B---D---E (master) 11# \ 12# C*---F---G (side) 13# 14# C was formerly part of master but master was rewound to remove C 15# 16test_expect_success setup ' 17 test_commit A && 18 test_commit B && 19 test_commit C && 20 git branch -t side && 21 git reset --hard HEAD^ && 22 test_commit D && 23 test_commit E && 24 git checkout side && 25 test_commit F && 26 test_commit G 27' 28 29test_rebase () { 30 expected="$1"&& 31shift&& 32 test_expect_success "git rebase $*"" 33 git checkout master && 34 git reset --hard E && 35 git checkout side && 36 git reset --hard G && 37 git rebase $* && 38 test_write_lines$expected>expect && 39 git log --pretty=%s >actual && 40 test_cmp expect actual 41 " 42} 43 44test_rebase 'G F E D B A' 45test_rebase 'G F D B A'--onto D 46test_rebase 'G F B A'--keep-base 47test_rebase 'G F C E D B A'--no-fork-point 48test_rebase 'G F C D B A'--no-fork-point --onto D 49test_rebase 'G F C B A'--no-fork-point --keep-base 50test_rebase 'G F E D B A'--fork-point refs/heads/master 51test_rebase 'G F D B A'--fork-point --onto D refs/heads/master 52test_rebase 'G F B A'--fork-point --keep-base refs/heads/master 53test_rebase 'G F C E D B A' refs/heads/master 54test_rebase 'G F C D B A'--onto D refs/heads/master 55test_rebase 'G F C B A'--keep-base refs/heads/master 56 57test_done