Andrew's git - gitweb.git/blob

   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Amos Waterland
   4#
   5
   6test_description='git rebase assorted tests
   7
   8This test runs git rebase and checks that the author information is not lost
   9among other things.
  10'
  11. ./test-lib.sh
  12
  13GIT_AUTHOR_NAME=author@name
  14GIT_AUTHOR_EMAIL=bogus@email@address
  15export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
  16
  17test_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
  47test_expect_success 'rebase on dirty worktree' '
  48        echo dirty >>A &&
  49        test_must_fail git rebase master
  50'
  51
  52test_expect_success 'rebase on dirty cache' '
  53        git add A &&
  54        test_must_fail git rebase master
  55'
  56
  57test_expect_success 'rebase against master' '
  58        git reset --hard HEAD &&
  59        git rebase master
  60'
  61
  62test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' '
  63        git checkout -b orig-head topic &&
  64        pre="$(git rev-parse --verify HEAD)" &&
  65        git rebase master &&
  66        test_cmp_rev "$pre" ORIG_HEAD &&
  67        ! test_cmp_rev "$pre" HEAD
  68'
  69
  70test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
  71        test_when_finished "git branch -D torebase" &&
  72        git checkout -b torebase my-topic-branch^ &&
  73        upstream=$(git rev-parse ":/Add B") &&
  74        onto=$(git rev-parse ":/Add A") &&
  75        git rebase --onto $onto $upstream &&
  76        git reset --hard my-topic-branch^ &&
  77        git rebase --onto ":/Add A" ":/Add B" &&
  78        git checkout my-topic-branch
  79'
  80
  81test_expect_success 'the rebase operation should not have destroyed author information' '
  82        ! (git log | grep "Author:" | grep "<>")
  83'
  84
  85test_expect_success 'the rebase operation should not have destroyed author information (2)' "
  86        git log -1 |
  87        grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
  88"
  89
  90test_expect_success 'HEAD was detached during rebase' '
  91        test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
  92'
  93
  94test_expect_success 'rebase from ambiguous branch name' '
  95        git checkout -b topic side &&
  96        git rebase master
  97'
  98
  99test_expect_success 'rebase off of the previous branch using "-"' '
 100        git checkout master &&
 101        git checkout HEAD^ &&
 102        git rebase @{-1} >expect.messages &&
 103        git merge-base master HEAD >expect.forkpoint &&
 104
 105        git checkout master &&
 106        git checkout HEAD^ &&
 107        git rebase - >actual.messages &&
 108        git merge-base master HEAD >actual.forkpoint &&
 109
 110        test_cmp expect.forkpoint actual.forkpoint &&
 111        # the next one is dubious---we may want to say "-",
 112        # instead of @{-1}, in the message
 113        test_i18ncmp expect.messages actual.messages
 114'
 115
 116test_expect_success 'rebase a single mode change' '
 117        git checkout master &&
 118        git branch -D topic &&
 119        echo 1 >X &&
 120        git add X &&
 121        test_tick &&
 122        git commit -m prepare &&
 123        git checkout -b modechange HEAD^ &&
 124        echo 1 >X &&
 125        git add X &&
 126        test_chmod +x A &&
 127        test_tick &&
 128        git commit -m modechange &&
 129        GIT_TRACE=1 git rebase master
 130'
 131
 132test_expect_success 'rebase is not broken by diff.renames' '
 133        test_config diff.renames copies &&
 134        git checkout filemove &&
 135        GIT_TRACE=1 git rebase force-3way
 136'
 137
 138test_expect_success 'setup: recover' '
 139        test_might_fail git rebase --abort &&
 140        git reset --hard &&
 141        git checkout modechange
 142'
 143
 144test_expect_success 'Show verbose error when HEAD could not be detached' '
 145        >B &&
 146        test_must_fail git rebase topic 2>output.err >output.out &&
 147        test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
 148        test_i18ngrep B output.err
 149'
 150rm -f B
 151
 152test_expect_success 'fail when upstream arg is missing and not on branch' '
 153        git checkout topic &&
 154        test_must_fail git rebase
 155'
 156
 157test_expect_success 'fail when upstream arg is missing and not configured' '
 158        git checkout -b no-config topic &&
 159        test_must_fail git rebase
 160'
 161
 162test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' '
 163        git checkout -b default-base master &&
 164        git checkout -b default topic &&
 165        git config branch.default.remote . &&
 166        git config branch.default.merge refs/heads/default-base &&
 167        git rebase &&
 168        git rev-parse --verify default-base >expect &&
 169        git rev-parse default~1 >actual &&
 170        test_cmp expect actual &&
 171        git checkout default-base &&
 172        git reset --hard HEAD^ &&
 173        git checkout default &&
 174        git rebase &&
 175        git rev-parse --verify default-base >expect &&
 176        git rev-parse default~1 >actual &&
 177        test_cmp expect actual
 178'
 179
 180test_expect_success 'cherry-picked commits and fork-point work together' '
 181        git checkout default-base &&
 182        echo Amended >A &&
 183        git commit -a --no-edit --amend &&
 184        test_commit B B &&
 185        test_commit new_B B "New B" &&
 186        test_commit C C &&
 187        git checkout default &&
 188        git reset --hard default-base@{4} &&
 189        test_commit D D &&
 190        git cherry-pick -2 default-base^ &&
 191        test_commit final_B B "Final B" &&
 192        git rebase &&
 193        echo Amended >expect &&
 194        test_cmp expect A &&
 195        echo "Final B" >expect &&
 196        test_cmp expect B &&
 197        echo C >expect &&
 198        test_cmp expect C &&
 199        echo D >expect &&
 200        test_cmp expect D
 201'
 202
 203test_expect_success 'rebase -q is quiet' '
 204        git checkout -b quiet topic &&
 205        git rebase -q master >output.out 2>&1 &&
 206        test_must_be_empty output.out
 207'
 208
 209test_expect_success 'Rebase a commit that sprinkles CRs in' '
 210        (
 211                echo "One" &&
 212                echo "TwoQ" &&
 213                echo "Three" &&
 214                echo "FQur" &&
 215                echo "Five"
 216        ) | q_to_cr >CR &&
 217        git add CR &&
 218        test_tick &&
 219        git commit -a -m "A file with a line with CR" &&
 220        git tag file-with-cr &&
 221        git checkout HEAD^0 &&
 222        git rebase --onto HEAD^^ HEAD^ &&
 223        git diff --exit-code file-with-cr:CR HEAD:CR
 224'
 225
 226test_expect_success 'rebase can copy notes' '
 227        git config notes.rewrite.rebase true &&
 228        git config notes.rewriteRef "refs/notes/*" &&
 229        test_commit n1 &&
 230        test_commit n2 &&
 231        test_commit n3 &&
 232        git notes add -m"a note" n3 &&
 233        git rebase --onto n1 n2 &&
 234        test "a note" = "$(git notes show HEAD)"
 235'
 236
 237test_expect_success 'rebase -m can copy notes' '
 238        git reset --hard n3 &&
 239        git rebase -m --onto n1 n2 &&
 240        test "a note" = "$(git notes show HEAD)"
 241'
 242
 243test_expect_success 'rebase commit with an ancient timestamp' '
 244        git reset --hard &&
 245
 246        >old.one && git add old.one && test_tick &&
 247        git commit --date="@12345 +0400" -m "Old one" &&
 248        >old.two && git add old.two && test_tick &&
 249        git commit --date="@23456 +0500" -m "Old two" &&
 250        >old.three && git add old.three && test_tick &&
 251        git commit --date="@34567 +0600" -m "Old three" &&
 252
 253        git cat-file commit HEAD^^ >actual &&
 254        grep "author .* 12345 +0400$" actual &&
 255        git cat-file commit HEAD^ >actual &&
 256        grep "author .* 23456 +0500$" actual &&
 257        git cat-file commit HEAD >actual &&
 258        grep "author .* 34567 +0600$" actual &&
 259
 260        git rebase --onto HEAD^^ HEAD^ &&
 261
 262        git cat-file commit HEAD >actual &&
 263        grep "author .* 34567 +0600$" actual
 264'
 265
 266test_expect_success 'rebase with "From " line in commit message' '
 267        git checkout -b preserve-from master~1 &&
 268        cat >From_.msg <<EOF &&
 269Somebody embedded an mbox in a commit message
 270
 271This is from so-and-so:
 272
 273From a@b Mon Sep 17 00:00:00 2001
 274From: John Doe <nobody@example.com>
 275Date: Sat, 11 Nov 2017 00:00:00 +0000
 276Subject: not this message
 277
 278something
 279EOF
 280        >From_ &&
 281        git add From_ &&
 282        git commit -F From_.msg &&
 283        git rebase master &&
 284        git log -1 --pretty=format:%B >out &&
 285        test_cmp From_.msg out
 286'
 287
 288test_expect_success 'rebase --am and --show-current-patch' '
 289        test_create_repo conflict-apply &&
 290        (
 291                cd conflict-apply &&
 292                test_commit init &&
 293                echo one >>init.t &&
 294                git commit -a -m one &&
 295                echo two >>init.t &&
 296                git commit -a -m two &&
 297                git tag two &&
 298                test_must_fail git rebase --onto init HEAD^ &&
 299                GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
 300                grep "show.*$(git rev-parse two)" stderr
 301        )
 302'
 303
 304test_expect_success 'rebase--merge.sh and --show-current-patch' '
 305        test_create_repo conflict-merge &&
 306        (
 307                cd conflict-merge &&
 308                test_commit init &&
 309                echo one >>init.t &&
 310                git commit -a -m one &&
 311                echo two >>init.t &&
 312                git commit -a -m two &&
 313                git tag two &&
 314                test_must_fail git rebase --merge --onto init HEAD^ &&
 315                git rebase --show-current-patch >actual.patch &&
 316                GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
 317                grep "show.*REBASE_HEAD" stderr &&
 318                test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)"
 319        )
 320'
 321
 322test_expect_success 'rebase -c rebase.useBuiltin=false warning' '
 323        expected="rebase.useBuiltin support has been removed" &&
 324
 325        # Only warn when the legacy rebase is requested...
 326        test_must_fail git -c rebase.useBuiltin=false rebase 2>err &&
 327        test_i18ngrep "$expected" err &&
 328        test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=false git rebase 2>err &&
 329        test_i18ngrep "$expected" err &&
 330
 331        # ...not when we would have used the built-in anyway
 332        test_must_fail git -c rebase.useBuiltin=true rebase 2>err &&
 333        test_must_be_empty err &&
 334        test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true git rebase 2>err &&
 335        test_must_be_empty err
 336'
 337
 338test_done