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 -f my-topic-branch &&
  44         git tag topic
  45 '
  46
  47 test_expect_success 'rebase on dirty worktree' '
  48         echo dirty >>A &&
  49         test_must_fail git rebase master
  50 '
  51
  52 test_expect_success 'rebase on dirty cache' '
  53         git add A &&
  54         test_must_fail git rebase master
  55 '
  56
  57 test_expect_success 'rebase against master' '
  58         git reset --hard HEAD &&
  59         git rebase master
  60 '
  61
  62 test_expect_success 'rebase against master twice' '
  63         git rebase master >out &&
  64         test_i18ngrep "Current branch my-topic-branch is up to date" out
  65 '
  66
  67 test_expect_success 'rebase against master twice with --force' '
  68         git rebase --force-rebase master >out &&
  69         test_i18ngrep "Current branch my-topic-branch is up to date, rebase forced" out
  70 '
  71
  72 test_expect_success 'rebase against master twice from another branch' '
  73         git checkout my-topic-branch^ &&
  74         git rebase master my-topic-branch >out &&
  75         test_i18ngrep "Current branch my-topic-branch is up to date" out
  76 '
  77
  78 test_expect_success 'rebase fast-forward to master' '
  79         git checkout my-topic-branch^ &&
  80         git rebase my-topic-branch >out &&
  81         test_i18ngrep "Fast-forwarded HEAD to my-topic-branch" out
  82 '
  83
  84 test_expect_success 'the rebase operation should not have destroyed author information' '
  85         ! (git log | grep "Author:" | grep "<>")
  86 '
  87
  88 test_expect_success 'the rebase operation should not have destroyed author information (2)' "
  89         git log -1 |
  90         grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
  91 "
  92
  93 test_expect_success 'HEAD was detached during rebase' '
  94         test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
  95 '
  96
  97 test_expect_success 'rebase from ambiguous branch name' '
  98         git checkout -b topic side &&
  99         git rebase master
 100 '
 101
 102 test_expect_success 'rebase a single mode change' '
 103         git checkout master &&
 104         git branch -D topic &&
 105         echo 1 >X &&
 106         git add X &&
 107         test_tick &&
 108         git commit -m prepare &&
 109         git checkout -b modechange HEAD^ &&
 110         echo 1 >X &&
 111         git add X &&
 112         test_chmod +x A &&
 113         test_tick &&
 114         git commit -m modechange &&
 115         GIT_TRACE=1 git rebase master
 116 '
 117
 118 test_expect_success 'rebase is not broken by diff.renames' '
 119         test_config diff.renames copies &&
 120         git checkout filemove &&
 121         GIT_TRACE=1 git rebase force-3way
 122 '
 123
 124 test_expect_success 'setup: recover' '
 125         test_might_fail git rebase --abort &&
 126         git reset --hard &&
 127         git checkout modechange
 128 '
 129
 130 test_expect_success 'Show verbose error when HEAD could not be detached' '
 131         >B &&
 132         test_must_fail git rebase topic 2>output.err >output.out &&
 133         grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
 134         grep B output.err
 135 '
 136 rm -f B
 137
 138 test_expect_success 'fail when upstream arg is missing and not on branch' '
 139         git checkout topic &&
 140         test_must_fail git rebase
 141 '
 142
 143 test_expect_success 'fail when upstream arg is missing and not configured' '
 144         git checkout -b no-config topic &&
 145         test_must_fail git rebase
 146 '
 147
 148 test_expect_success 'default to @{upstream} when upstream arg is missing' '
 149         git checkout -b default topic &&
 150         git config branch.default.remote . &&
 151         git config branch.default.merge refs/heads/master &&
 152         git rebase &&
 153         test "$(git rev-parse default~1)" = "$(git rev-parse master)"
 154 '
 155
 156 test_expect_success 'rebase -q is quiet' '
 157         git checkout -b quiet topic &&
 158         git rebase -q master >output.out 2>&1 &&
 159         test ! -s output.out
 160 '
 161
 162 test_expect_success 'Rebase a commit that sprinkles CRs in' '
 163         (
 164                 echo "One"
 165                 echo "TwoQ"
 166                 echo "Three"
 167                 echo "FQur"
 168                 echo "Five"
 169         ) | q_to_cr >CR &&
 170         git add CR &&
 171         test_tick &&
 172         git commit -a -m "A file with a line with CR" &&
 173         git tag file-with-cr &&
 174         git checkout HEAD^0 &&
 175         git rebase --onto HEAD^^ HEAD^ &&
 176         git diff --exit-code file-with-cr:CR HEAD:CR
 177 '
 178
 179 test_expect_success 'rebase can copy notes' '
 180         git config notes.rewrite.rebase true &&
 181         git config notes.rewriteRef "refs/notes/*" &&
 182         test_commit n1 &&
 183         test_commit n2 &&
 184         test_commit n3 &&
 185         git notes add -m"a note" n3 &&
 186         git rebase --onto n1 n2 &&
 187         test "a note" = "$(git notes show HEAD)"
 188 '
 189
 190 test_expect_success 'rebase -m can copy notes' '
 191         git reset --hard n3 &&
 192         git rebase -m --onto n1 n2 &&
 193         test "a note" = "$(git notes show HEAD)"
 194 '
 195
 196 test_expect_success 'rebase commit with an ancient timestamp' '
 197         git reset --hard &&
 198
 199         >old.one && git add old.one && test_tick &&
 200         git commit --date="@12345 +0400" -m "Old one" &&
 201         >old.two && git add old.two && test_tick &&
 202         git commit --date="@23456 +0500" -m "Old two" &&
 203         >old.three && git add old.three && test_tick &&
 204         git commit --date="@34567 +0600" -m "Old three" &&
 205
 206         git cat-file commit HEAD^^ >actual &&
 207         grep "author .* 12345 +0400$" actual &&
 208         git cat-file commit HEAD^ >actual &&
 209         grep "author .* 23456 +0500$" actual &&
 210         git cat-file commit HEAD >actual &&
 211         grep "author .* 34567 +0600$" actual &&
 212
 213         git rebase --onto HEAD^^ HEAD^ &&
 214
 215         git cat-file commit HEAD >actual &&
 216         grep "author .* 34567 +0600$" actual
 217 '
 218
 219 test_done