t/t3424-rebase-empty.sh

   1 #!/bin/sh
   2
   3 test_description='git rebase of commits that start or become empty'
   4
   5 TEST_PASSES_SANITIZE_LEAK=true
   6 . ./test-lib.sh
   7
   8 test_expect_success 'setup test repository' '
   9         test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
  10         test_write_lines A B C D E F G H I J >letters &&
  11         git add numbers letters &&
  12         git commit -m A &&
  13
  14         git branch upstream &&
  15         git branch localmods &&
  16
  17         git checkout upstream &&
  18         test_write_lines A B C D E >letters &&
  19         git add letters &&
  20         git commit -m B &&
  21
  22         test_write_lines 1 2 3 4 five 6 7 8 9 ten >numbers &&
  23         git add numbers &&
  24         git commit -m C &&
  25
  26         git checkout localmods &&
  27         test_write_lines 1 2 3 4 five 6 7 8 9 10 >numbers &&
  28         git add numbers &&
  29         git commit -m C2 &&
  30
  31         git commit --allow-empty -m D &&
  32
  33         test_write_lines A B C D E >letters &&
  34         git add letters &&
  35         git commit -m "Five letters ought to be enough for anybody"
  36 '
  37
  38 test_expect_failure 'rebase (apply-backend)' '
  39         test_when_finished "git rebase --abort" &&
  40         git checkout -B testing localmods &&
  41         # rebase (--apply) should not drop commits that start empty
  42         git rebase --apply upstream &&
  43
  44         test_write_lines D C B A >expect &&
  45         git log --format=%s >actual &&
  46         test_cmp expect actual
  47 '
  48
  49 test_expect_success 'rebase --merge --empty=drop' '
  50         git checkout -B testing localmods &&
  51         git rebase --merge --empty=drop upstream &&
  52
  53         test_write_lines D C B A >expect &&
  54         git log --format=%s >actual &&
  55         test_cmp expect actual
  56 '
  57
  58 test_expect_success 'rebase --merge uses default of --empty=drop' '
  59         git checkout -B testing localmods &&
  60         git rebase --merge upstream &&
  61
  62         test_write_lines D C B A >expect &&
  63         git log --format=%s >actual &&
  64         test_cmp expect actual
  65 '
  66
  67 test_expect_success 'rebase --merge --empty=keep' '
  68         git checkout -B testing localmods &&
  69         git rebase --merge --empty=keep upstream &&
  70
  71         test_write_lines D C2 C B A >expect &&
  72         git log --format=%s >actual &&
  73         test_cmp expect actual
  74 '
  75
  76 test_expect_success 'rebase --merge --empty=stop' '
  77         git checkout -B testing localmods &&
  78         test_must_fail git rebase --merge --empty=stop upstream &&
  79
  80         git rebase --skip &&
  81
  82         test_write_lines D C B A >expect &&
  83         git log --format=%s >actual &&
  84         test_cmp expect actual
  85 '
  86
  87 test_expect_success 'rebase --merge --empty=ask' '
  88         git checkout -B testing localmods &&
  89         test_must_fail git rebase --merge --empty=ask upstream &&
  90
  91         git rebase --skip &&
  92
  93         test_write_lines D C B A >expect &&
  94         git log --format=%s >actual &&
  95         test_cmp expect actual
  96 '
  97
  98 test_expect_success 'rebase --interactive --empty=drop' '
  99         git checkout -B testing localmods &&
 100         git rebase --interactive --empty=drop upstream &&
 101
 102         test_write_lines D C B A >expect &&
 103         git log --format=%s >actual &&
 104         test_cmp expect actual
 105 '
 106
 107 test_expect_success 'rebase --interactive --empty=keep' '
 108         git checkout -B testing localmods &&
 109         git rebase --interactive --empty=keep upstream &&
 110
 111         test_write_lines D C2 C B A >expect &&
 112         git log --format=%s >actual &&
 113         test_cmp expect actual
 114 '
 115
 116 test_expect_success 'rebase --interactive --empty=stop' '
 117         git checkout -B testing localmods &&
 118         test_must_fail git rebase --interactive --empty=stop upstream &&
 119
 120         git rebase --skip &&
 121
 122         test_write_lines D C B A >expect &&
 123         git log --format=%s >actual &&
 124         test_cmp expect actual
 125 '
 126
 127 test_expect_success 'rebase --interactive uses default of --empty=stop' '
 128         git checkout -B testing localmods &&
 129         test_must_fail git rebase --interactive upstream &&
 130
 131         git rebase --skip &&
 132
 133         test_write_lines D C B A >expect &&
 134         git log --format=%s >actual &&
 135         test_cmp expect actual
 136 '
 137
 138 test_expect_success 'rebase --merge --empty=drop --keep-empty' '
 139         git checkout -B testing localmods &&
 140         git rebase --merge --empty=drop --keep-empty upstream &&
 141
 142         test_write_lines D C B A >expect &&
 143         git log --format=%s >actual &&
 144         test_cmp expect actual
 145 '
 146
 147 test_expect_success 'rebase --merge --empty=drop --no-keep-empty' '
 148         git checkout -B testing localmods &&
 149         git rebase --merge --empty=drop --no-keep-empty upstream &&
 150
 151         test_write_lines C B A >expect &&
 152         git log --format=%s >actual &&
 153         test_cmp expect actual
 154 '
 155
 156 test_expect_success 'rebase --merge --empty=keep --keep-empty' '
 157         git checkout -B testing localmods &&
 158         git rebase --merge --empty=keep --keep-empty upstream &&
 159
 160         test_write_lines D C2 C B A >expect &&
 161         git log --format=%s >actual &&
 162         test_cmp expect actual
 163 '
 164
 165 test_expect_success 'rebase --merge --empty=keep --no-keep-empty' '
 166         git checkout -B testing localmods &&
 167         git rebase --merge --empty=keep --no-keep-empty upstream &&
 168
 169         test_write_lines C2 C B A >expect &&
 170         git log --format=%s >actual &&
 171         test_cmp expect actual
 172 '
 173
 174 test_expect_success 'rebase --merge does not leave state laying around' '
 175         git checkout -B testing localmods~2 &&
 176         git rebase --merge upstream &&
 177
 178         test_path_is_missing .git/CHERRY_PICK_HEAD &&
 179         test_path_is_missing .git/MERGE_MSG
 180 '
 181
 182 test_expect_success 'rebase --exec --empty=drop' '
 183         git checkout -B testing localmods &&
 184         git rebase --exec "true" --empty=drop upstream &&
 185
 186         test_write_lines D C B A >expect &&
 187         git log --format=%s >actual &&
 188         test_cmp expect actual
 189 '
 190
 191 test_expect_success 'rebase --exec --empty=keep' '
 192         git checkout -B testing localmods &&
 193         git rebase --exec "true" --empty=keep upstream &&
 194
 195         test_write_lines D C2 C B A >expect &&
 196         git log --format=%s >actual &&
 197         test_cmp expect actual
 198 '
 199
 200 test_expect_success 'rebase --exec uses default of --empty=keep' '
 201         git checkout -B testing localmods &&
 202         git rebase --exec "true" upstream &&
 203
 204         test_write_lines D C2 C B A >expect &&
 205         git log --format=%s >actual &&
 206         test_cmp expect actual
 207 '
 208
 209 test_expect_success 'rebase --exec --empty=stop' '
 210         git checkout -B testing localmods &&
 211         test_must_fail git rebase --exec "true" --empty=stop upstream &&
 212
 213         git rebase --skip &&
 214
 215         test_write_lines D C B A >expect &&
 216         git log --format=%s >actual &&
 217         test_cmp expect actual
 218 '
 219
 220 test_done