t/t3400-rebase.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005 Amos Waterland
   4 #
   5
   6 test_description='git rebase assorted tests
   7
   8 This test runs git rebase and checks that the author information is not lost
   9 among other things.
  10 '
  11 . ./test-lib.sh
  12
  13 GIT_AUTHOR_NAME=author@name
  14 GIT_AUTHOR_EMAIL=bogus@email@address
  15 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
  16
  17 test_expect_success 'prepare repository with topic branches' '
  18         git config core.logAllRefUpdates true &&
  19         echo First >A &&
  20         git update-index --add A &&
  21         git commit -m "Add A." &&
  22         git checkout -b force-3way &&
  23         echo Dummy >Y &&
  24         git update-index --add Y &&
  25         git commit -m "Add Y." &&
  26         git checkout -b filemove &&
  27         git reset --soft master &&
  28         mkdir D &&
  29         git mv A D/A &&
  30         git commit -m "Move A." &&
  31         git checkout -b my-topic-branch master &&
  32         echo Second >B &&
  33         git update-index --add B &&
  34         git commit -m "Add B." &&
  35         git checkout -f master &&
  36         echo Third >>A &&
  37         git update-index A &&
  38         git commit -m "Modify A." &&
  39         git checkout -b side my-topic-branch &&
  40         echo Side >>C &&
  41         git add C &&
  42         git commit -m "Add C" &&
  43         git checkout -b nonlinear my-topic-branch &&
  44         echo Edit >>B &&
  45         git add B &&
  46         git commit -m "Modify B" &&
  47         git merge side &&
  48         git checkout -b upstream-merged-nonlinear &&
  49         git merge master &&
  50         git checkout -f my-topic-branch &&
  51         git tag topic
  52 '
  53
  54 test_expect_success 'rebase on dirty worktree' '
  55         echo dirty >>A &&
  56         test_must_fail git rebase master
  57 '
  58
  59 test_expect_success 'rebase on dirty cache' '
  60         git add A &&
  61         test_must_fail git rebase master
  62 '
  63
  64 test_expect_success 'rebase against master' '
  65         git reset --hard HEAD &&
  66         git rebase master
  67 '
  68
  69 test_expect_success 'rebase against master twice' '
  70         git rebase master >out &&
  71         test_i18ngrep "Current branch my-topic-branch is up to date" out
  72 '
  73
  74 test_expect_success 'rebase against master twice with --force' '
  75         git rebase --force-rebase master >out &&
  76         test_i18ngrep "Current branch my-topic-branch is up to date, rebase forced" out
  77 '
  78
  79 test_expect_success 'rebase against master twice from another branch' '
  80         git checkout my-topic-branch^ &&
  81         git rebase master my-topic-branch >out &&
  82         test_i18ngrep "Current branch my-topic-branch is up to date" out
  83 '
  84
  85 test_expect_success 'rebase fast-forward to master' '
  86         git checkout my-topic-branch^ &&
  87         git rebase my-topic-branch >out &&
  88         test_i18ngrep "Fast-forwarded HEAD to my-topic-branch" out
  89 '
  90
  91 test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
  92         test_when_finished "git branch -D torebase" &&
  93         git checkout -b torebase my-topic-branch^ &&
  94         upstream=$(git rev-parse ":/Add B") &&
  95         onto=$(git rev-parse ":/Add A") &&
  96         git rebase --onto $onto $upstream &&
  97         git reset --hard my-topic-branch^ &&
  98         git rebase --onto ":/Add A" ":/Add B" &&
  99         git checkout my-topic-branch
 100 '
 101
 102 test_expect_success 'the rebase operation should not have destroyed author information' '
 103         ! (git log | grep "Author:" | grep "<>")
 104 '
 105
 106 test_expect_success 'the rebase operation should not have destroyed author information (2)' "
 107         git log -1 |
 108         grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
 109 "
 110
 111 test_expect_success 'HEAD was detached during rebase' '
 112         test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
 113 '
 114
 115 test_expect_success 'rebase from ambiguous branch name' '
 116         git checkout -b topic side &&
 117         git rebase master
 118 '
 119
 120 test_expect_success 'rebase after merge master' '
 121         git checkout --detach refs/tags/topic &&
 122         git branch -D topic &&
 123         git reset --hard topic &&
 124         git merge master &&
 125         git rebase master &&
 126         ! (git show | grep "^Merge:")
 127 '
 128
 129 test_expect_success 'rebase of history with merges is linearized' '
 130         git checkout nonlinear &&
 131         test 4 = $(git rev-list master.. | wc -l) &&
 132         git rebase master &&
 133         test 3 = $(git rev-list master.. | wc -l)
 134 '
 135
 136 test_expect_success 'rebase of history with merges after upstream merge is linearized' '
 137         git checkout upstream-merged-nonlinear &&
 138         test 5 = $(git rev-list master.. | wc -l) &&
 139         git rebase master &&
 140         test 3 = $(git rev-list master.. | wc -l)
 141 '
 142
 143 test_expect_success 'rebase a single mode change' '
 144         git checkout master &&
 145         echo 1 >X &&
 146         git add X &&
 147         test_tick &&
 148         git commit -m prepare &&
 149         git checkout -b modechange HEAD^ &&
 150         echo 1 >X &&
 151         git add X &&
 152         test_chmod +x A &&
 153         test_tick &&
 154         git commit -m modechange &&
 155         GIT_TRACE=1 git rebase master
 156 '
 157
 158 test_expect_success 'rebase is not broken by diff.renames' '
 159         test_config diff.renames copies &&
 160         git checkout filemove &&
 161         GIT_TRACE=1 git rebase force-3way
 162 '
 163
 164 test_expect_success 'setup: recover' '
 165         test_might_fail git rebase --abort &&
 166         git reset --hard &&
 167         git checkout modechange
 168 '
 169
 170 test_expect_success 'Show verbose error when HEAD could not be detached' '
 171         >B &&
 172         test_must_fail git rebase topic 2>output.err >output.out &&
 173         grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
 174         grep B output.err
 175 '
 176 rm -f B
 177
 178 test_expect_success 'fail when upstream arg is missing and not on branch' '
 179         git checkout topic &&
 180         test_must_fail git rebase
 181 '
 182
 183 test_expect_success 'fail when upstream arg is missing and not configured' '
 184         git checkout -b no-config topic &&
 185         test_must_fail git rebase
 186 '
 187
 188 test_expect_success 'default to @{upstream} when upstream arg is missing' '
 189         git checkout -b default topic &&
 190         git config branch.default.remote . &&
 191         git config branch.default.merge refs/heads/master &&
 192         git rebase &&
 193         test "$(git rev-parse default~1)" = "$(git rev-parse master)"
 194 '
 195
 196 test_expect_success 'rebase -q is quiet' '
 197         git checkout -b quiet topic &&
 198         git rebase -q master >output.out 2>&1 &&
 199         test ! -s output.out
 200 '
 201
 202 test_expect_success 'Rebase a commit that sprinkles CRs in' '
 203         (
 204                 echo "One"
 205                 echo "TwoQ"
 206                 echo "Three"
 207                 echo "FQur"
 208                 echo "Five"
 209         ) | q_to_cr >CR &&
 210         git add CR &&
 211         test_tick &&
 212         git commit -a -m "A file with a line with CR" &&
 213         git tag file-with-cr &&
 214         git checkout HEAD^0 &&
 215         git rebase --onto HEAD^^ HEAD^ &&
 216         git diff --exit-code file-with-cr:CR HEAD:CR
 217 '
 218
 219 test_expect_success 'rebase can copy notes' '
 220         git config notes.rewrite.rebase true &&
 221         git config notes.rewriteRef "refs/notes/*" &&
 222         test_commit n1 &&
 223         test_commit n2 &&
 224         test_commit n3 &&
 225         git notes add -m"a note" n3 &&
 226         git rebase --onto n1 n2 &&
 227         test "a note" = "$(git notes show HEAD)"
 228 '
 229
 230 test_expect_success 'rebase -m can copy notes' '
 231         git reset --hard n3 &&
 232         git rebase -m --onto n1 n2 &&
 233         test "a note" = "$(git notes show HEAD)"
 234 '
 235
 236 test_expect_success 'rebase commit with an ancient timestamp' '
 237         git reset --hard &&
 238
 239         >old.one && git add old.one && test_tick &&
 240         git commit --date="@12345 +0400" -m "Old one" &&
 241         >old.two && git add old.two && test_tick &&
 242         git commit --date="@23456 +0500" -m "Old two" &&
 243         >old.three && git add old.three && test_tick &&
 244         git commit --date="@34567 +0600" -m "Old three" &&
 245
 246         git cat-file commit HEAD^^ >actual &&
 247         grep "author .* 12345 +0400$" actual &&
 248         git cat-file commit HEAD^ >actual &&
 249         grep "author .* 23456 +0500$" actual &&
 250         git cat-file commit HEAD >actual &&
 251         grep "author .* 34567 +0600$" actual &&
 252
 253         git rebase --onto HEAD^^ HEAD^ &&
 254
 255         git cat-file commit HEAD >actual &&
 256         grep "author .* 34567 +0600$" actual
 257 '
 258
 259 test_done