t/t3431-rebase-fork-point.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2019 Denton Liu
   4 #
   5
   6 test_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 #
  16 test_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
  29 test_rebase () {
  30         expected="$1" &&
  31         shift &&
  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
  44 test_rebase 'G F E D B A'
  45 test_rebase 'G F D B A' --onto D
  46 test_rebase 'G F B A' --keep-base
  47 test_rebase 'G F C E D B A' --no-fork-point
  48 test_rebase 'G F C D B A' --no-fork-point --onto D
  49 test_rebase 'G F C B A' --no-fork-point --keep-base
  50
  51 test_rebase 'G F E D B A' --fork-point refs/heads/master
  52 test_rebase 'G F E D B A' --fork-point master
  53
  54 test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
  55 test_rebase 'G F D B A' --fork-point --onto D master
  56
  57 test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
  58 test_rebase 'G F B A' --fork-point --keep-base master
  59
  60 test_rebase 'G F C E D B A' refs/heads/master
  61 test_rebase 'G F C E D B A' master
  62
  63 test_rebase 'G F C D B A' --onto D refs/heads/master
  64 test_rebase 'G F C D B A' --onto D master
  65
  66 test_rebase 'G F C B A' --keep-base refs/heads/master
  67 test_rebase 'G F C B A' --keep-base master
  68
  69 test_expect_success 'git rebase --fork-point with ambigous refname' '
  70         git checkout master &&
  71         git checkout -b one &&
  72         git checkout side &&
  73         git tag one &&
  74         test_must_fail git rebase --fork-point --onto D one
  75 '
  76
  77 test_done