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 a single mode change' '
  92         git checkout master &&
  93         git branch -D topic &&
  94         echo 1 >X &&
  95         git add X &&
  96         test_tick &&
  97         git commit -m prepare &&
  98         git checkout -b modechange HEAD^ &&
  99         echo 1 >X &&
 100         git add X &&
 101         test_chmod +x A &&
 102         test_tick &&
 103         git commit -m modechange &&
 104         GIT_TRACE=1 git rebase master
 105 '
 106
 107 test_expect_success 'rebase is not broken by diff.renames' '
 108         test_config diff.renames copies &&
 109         git checkout filemove &&
 110         GIT_TRACE=1 git rebase force-3way
 111 '
 112
 113 test_expect_success 'setup: recover' '
 114         test_might_fail git rebase --abort &&
 115         git reset --hard &&
 116         git checkout modechange
 117 '
 118
 119 test_expect_success 'Show verbose error when HEAD could not be detached' '
 120         >B &&
 121         test_must_fail git rebase topic 2>output.err >output.out &&
 122         grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
 123         grep B output.err
 124 '
 125 rm -f B
 126
 127 test_expect_success 'fail when upstream arg is missing and not on branch' '
 128         git checkout topic &&
 129         test_must_fail git rebase
 130 '
 131
 132 test_expect_success 'fail when upstream arg is missing and not configured' '
 133         git checkout -b no-config topic &&
 134         test_must_fail git rebase
 135 '
 136
 137 test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' '
 138         git checkout -b default topic &&
 139         git config branch.default.remote . &&
 140         git config branch.default.merge refs/heads/master &&
 141         git rebase &&
 142         git rev-parse --verify master >expect &&
 143         git rev-parse default~1 >actual &&
 144         test_cmp expect actual
 145 '
 146
 147 test_expect_success 'rebase -q is quiet' '
 148         git checkout -b quiet topic &&
 149         git rebase -q master >output.out 2>&1 &&
 150         test_must_be_empty output.out
 151 '
 152
 153 test_expect_success 'Rebase a commit that sprinkles CRs in' '
 154         (
 155                 echo "One"
 156                 echo "TwoQ"
 157                 echo "Three"
 158                 echo "FQur"
 159                 echo "Five"
 160         ) | q_to_cr >CR &&
 161         git add CR &&
 162         test_tick &&
 163         git commit -a -m "A file with a line with CR" &&
 164         git tag file-with-cr &&
 165         git checkout HEAD^0 &&
 166         git rebase --onto HEAD^^ HEAD^ &&
 167         git diff --exit-code file-with-cr:CR HEAD:CR
 168 '
 169
 170 test_expect_success 'rebase can copy notes' '
 171         git config notes.rewrite.rebase true &&
 172         git config notes.rewriteRef "refs/notes/*" &&
 173         test_commit n1 &&
 174         test_commit n2 &&
 175         test_commit n3 &&
 176         git notes add -m"a note" n3 &&
 177         git rebase --onto n1 n2 &&
 178         test "a note" = "$(git notes show HEAD)"
 179 '
 180
 181 test_expect_success 'rebase -m can copy notes' '
 182         git reset --hard n3 &&
 183         git rebase -m --onto n1 n2 &&
 184         test "a note" = "$(git notes show HEAD)"
 185 '
 186
 187 test_expect_success 'rebase commit with an ancient timestamp' '
 188         git reset --hard &&
 189
 190         >old.one && git add old.one && test_tick &&
 191         git commit --date="@12345 +0400" -m "Old one" &&
 192         >old.two && git add old.two && test_tick &&
 193         git commit --date="@23456 +0500" -m "Old two" &&
 194         >old.three && git add old.three && test_tick &&
 195         git commit --date="@34567 +0600" -m "Old three" &&
 196
 197         git cat-file commit HEAD^^ >actual &&
 198         grep "author .* 12345 +0400$" actual &&
 199         git cat-file commit HEAD^ >actual &&
 200         grep "author .* 23456 +0500$" actual &&
 201         git cat-file commit HEAD >actual &&
 202         grep "author .* 34567 +0600$" actual &&
 203
 204         git rebase --onto HEAD^^ HEAD^ &&
 205
 206         git cat-file commit HEAD >actual &&
 207         grep "author .* 34567 +0600$" actual
 208 '
 209
 210 test_done