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, with <onto> and <upstream> specified as :/quuxery' '
  63         test_when_finished "git branch -D torebase" &&
  64         git checkout -b torebase my-topic-branch^ &&
  65         upstream=$(git rev-parse ":/Add B") &&
  66         onto=$(git rev-parse ":/Add A") &&
  67         git rebase --onto $onto $upstream &&
  68         git reset --hard my-topic-branch^ &&
  69         git rebase --onto ":/Add A" ":/Add B" &&
  70         git checkout my-topic-branch
  71 '
  72
  73 test_expect_success 'the rebase operation should not have destroyed author information' '
  74         ! (git log | grep "Author:" | grep "<>")
  75 '
  76
  77 test_expect_success 'the rebase operation should not have destroyed author information (2)' "
  78         git log -1 |
  79         grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
  80 "
  81
  82 test_expect_success 'HEAD was detached during rebase' '
  83         test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
  84 '
  85
  86 test_expect_success 'rebase from ambiguous branch name' '
  87         git checkout -b topic side &&
  88         git rebase master
  89 '
  90
  91 test_expect_success 'rebase off of the previous branch using "-"' '
  92         git checkout master &&
  93         git checkout HEAD^ &&
  94         git rebase master >expect.messages &&
  95         git merge-base master HEAD >expect.forkpoint &&
  96
  97         git checkout master &&
  98         git checkout HEAD^ &&
  99         git rebase - >actual.messages &&
 100         git merge-base master HEAD >actual.forkpoint &&
 101
 102         test_cmp expect.forkpoint actual.forkpoint &&
 103         test_i18ncmp expect.messages actual.messages
 104 '
 105
 106 test_expect_success 'rebase a single mode change' '
 107         git checkout master &&
 108         git branch -D topic &&
 109         echo 1 >X &&
 110         git add X &&
 111         test_tick &&
 112         git commit -m prepare &&
 113         git checkout -b modechange HEAD^ &&
 114         echo 1 >X &&
 115         git add X &&
 116         test_chmod +x A &&
 117         test_tick &&
 118         git commit -m modechange &&
 119         GIT_TRACE=1 git rebase master
 120 '
 121
 122 test_expect_success 'rebase is not broken by diff.renames' '
 123         test_config diff.renames copies &&
 124         git checkout filemove &&
 125         GIT_TRACE=1 git rebase force-3way
 126 '
 127
 128 test_expect_success 'setup: recover' '
 129         test_might_fail git rebase --abort &&
 130         git reset --hard &&
 131         git checkout modechange
 132 '
 133
 134 test_expect_success 'Show verbose error when HEAD could not be detached' '
 135         >B &&
 136         test_must_fail git rebase topic 2>output.err >output.out &&
 137         grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
 138         grep B output.err
 139 '
 140 rm -f B
 141
 142 test_expect_success 'fail when upstream arg is missing and not on branch' '
 143         git checkout topic &&
 144         test_must_fail git rebase
 145 '
 146
 147 test_expect_success 'fail when upstream arg is missing and not configured' '
 148         git checkout -b no-config topic &&
 149         test_must_fail git rebase
 150 '
 151
 152 test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' '
 153         git checkout -b default-base master &&
 154         git checkout -b default topic &&
 155         git config branch.default.remote . &&
 156         git config branch.default.merge refs/heads/default-base &&
 157         git rebase &&
 158         git rev-parse --verify default-base >expect &&
 159         git rev-parse default~1 >actual &&
 160         test_cmp expect actual &&
 161         git checkout default-base &&
 162         git reset --hard HEAD^ &&
 163         git checkout default &&
 164         git rebase &&
 165         git rev-parse --verify default-base >expect &&
 166         git rev-parse default~1 >actual &&
 167         test_cmp expect actual
 168 '
 169
 170 test_expect_success 'cherry-picked commits and fork-point work together' '
 171         git checkout default-base &&
 172         echo Amended >A &&
 173         git commit -a --no-edit --amend &&
 174         test_commit B B &&
 175         test_commit new_B B "New B" &&
 176         test_commit C C &&
 177         git checkout default &&
 178         git reset --hard default-base@{4} &&
 179         test_commit D D &&
 180         git cherry-pick -2 default-base^ &&
 181         test_commit final_B B "Final B" &&
 182         git rebase &&
 183         echo Amended >expect &&
 184         test_cmp A expect &&
 185         echo "Final B" >expect &&
 186         test_cmp B expect &&
 187         echo C >expect &&
 188         test_cmp C expect &&
 189         echo D >expect &&
 190         test_cmp D expect
 191 '
 192
 193 test_expect_success 'rebase -q is quiet' '
 194         git checkout -b quiet topic &&
 195         git rebase -q master >output.out 2>&1 &&
 196         test_must_be_empty output.out
 197 '
 198
 199 test_expect_success 'Rebase a commit that sprinkles CRs in' '
 200         (
 201                 echo "One"
 202                 echo "TwoQ"
 203                 echo "Three"
 204                 echo "FQur"
 205                 echo "Five"
 206         ) | q_to_cr >CR &&
 207         git add CR &&
 208         test_tick &&
 209         git commit -a -m "A file with a line with CR" &&
 210         git tag file-with-cr &&
 211         git checkout HEAD^0 &&
 212         git rebase --onto HEAD^^ HEAD^ &&
 213         git diff --exit-code file-with-cr:CR HEAD:CR
 214 '
 215
 216 test_expect_success 'rebase can copy notes' '
 217         git config notes.rewrite.rebase true &&
 218         git config notes.rewriteRef "refs/notes/*" &&
 219         test_commit n1 &&
 220         test_commit n2 &&
 221         test_commit n3 &&
 222         git notes add -m"a note" n3 &&
 223         git rebase --onto n1 n2 &&
 224         test "a note" = "$(git notes show HEAD)"
 225 '
 226
 227 test_expect_success 'rebase -m can copy notes' '
 228         git reset --hard n3 &&
 229         git rebase -m --onto n1 n2 &&
 230         test "a note" = "$(git notes show HEAD)"
 231 '
 232
 233 test_expect_success 'rebase commit with an ancient timestamp' '
 234         git reset --hard &&
 235
 236         >old.one && git add old.one && test_tick &&
 237         git commit --date="@12345 +0400" -m "Old one" &&
 238         >old.two && git add old.two && test_tick &&
 239         git commit --date="@23456 +0500" -m "Old two" &&
 240         >old.three && git add old.three && test_tick &&
 241         git commit --date="@34567 +0600" -m "Old three" &&
 242
 243         git cat-file commit HEAD^^ >actual &&
 244         grep "author .* 12345 +0400$" actual &&
 245         git cat-file commit HEAD^ >actual &&
 246         grep "author .* 23456 +0500$" actual &&
 247         git cat-file commit HEAD >actual &&
 248         grep "author .* 34567 +0600$" actual &&
 249
 250         git rebase --onto HEAD^^ HEAD^ &&
 251
 252         git cat-file commit HEAD >actual &&
 253         grep "author .* 34567 +0600$" actual
 254 '
 255
 256 test_done