083d76814d93b2b8c886e19040561f3cab9e7ccc
   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 my-topic-branch &&
  23        echo Second >B &&
  24        git update-index --add B &&
  25        git commit -m "Add B." &&
  26        git checkout -f master &&
  27        echo Third >>A &&
  28        git update-index A &&
  29        git commit -m "Modify A." &&
  30        git checkout -b side my-topic-branch &&
  31        echo Side >>C &&
  32        git add C &&
  33        git commit -m "Add C" &&
  34        git checkout -b nonlinear my-topic-branch &&
  35        echo Edit >>B &&
  36        git add B &&
  37        git commit -m "Modify B" &&
  38        git merge side &&
  39        git checkout -b upstream-merged-nonlinear &&
  40        git merge master &&
  41        git checkout -f my-topic-branch &&
  42        git tag topic
  43'
  44
  45test_expect_success 'rebase on dirty worktree' '
  46        echo dirty >>A &&
  47        test_must_fail git rebase master
  48'
  49
  50test_expect_success 'rebase on dirty cache' '
  51        git add A &&
  52        test_must_fail git rebase master
  53'
  54
  55test_expect_success 'rebase against master' '
  56        git reset --hard HEAD &&
  57        git rebase master
  58'
  59
  60test_expect_success 'rebase against master twice' '
  61        git rebase master >out &&
  62        grep "Current branch my-topic-branch is up to date" out
  63'
  64
  65test_expect_success 'rebase against master twice with --force' '
  66        git rebase --force-rebase master >out &&
  67        grep "Current branch my-topic-branch is up to date, rebase forced" out
  68'
  69
  70test_expect_success 'rebase against master twice from another branch' '
  71        git checkout my-topic-branch^ &&
  72        git rebase master my-topic-branch >out &&
  73        grep "Current branch my-topic-branch is up to date" out
  74'
  75
  76test_expect_success 'rebase fast-forward to master' '
  77        git checkout my-topic-branch^ &&
  78        git rebase my-topic-branch >out &&
  79        grep "Fast-forwarded HEAD to my-topic-branch" out
  80'
  81
  82test_expect_success 'the rebase operation should not have destroyed author information' '
  83        ! (git log | grep "Author:" | grep "<>")
  84'
  85
  86test_expect_success 'the rebase operation should not have destroyed author information (2)' "
  87        git log -1 |
  88        grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
  89"
  90
  91test_expect_success 'HEAD was detached during rebase' '
  92        test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
  93'
  94
  95test_expect_success 'rebase after merge master' '
  96        git reset --hard topic &&
  97        git merge master &&
  98        git rebase master &&
  99        ! (git show | grep "^Merge:")
 100'
 101
 102test_expect_success 'rebase of history with merges is linearized' '
 103        git checkout nonlinear &&
 104        test 4 = $(git rev-list master.. | wc -l) &&
 105        git rebase master &&
 106        test 3 = $(git rev-list master.. | wc -l)
 107'
 108
 109test_expect_success 'rebase of history with merges after upstream merge is linearized' '
 110        git checkout upstream-merged-nonlinear &&
 111        test 5 = $(git rev-list master.. | wc -l) &&
 112        git rebase master &&
 113        test 3 = $(git rev-list master.. | wc -l)
 114'
 115
 116test_expect_success 'rebase a single mode change' '
 117        git checkout master &&
 118        echo 1 >X &&
 119        git add X &&
 120        test_tick &&
 121        git commit -m prepare &&
 122        git checkout -b modechange HEAD^ &&
 123        echo 1 >X &&
 124        git add X &&
 125        test_chmod +x A &&
 126        test_tick &&
 127        git commit -m modechange &&
 128        GIT_TRACE=1 git rebase master
 129'
 130
 131test_expect_success 'Show verbose error when HEAD could not be detached' '
 132        >B &&
 133        test_must_fail git rebase topic 2>output.err >output.out &&
 134        grep "Untracked working tree file .B. would be overwritten" output.err
 135'
 136rm -f B
 137
 138test_expect_success 'dump usage when upstream arg is missing' '
 139        git checkout -b usage topic &&
 140        test_must_fail git rebase 2>error1 &&
 141        grep "[Uu]sage" error1 &&
 142        test_must_fail git rebase --abort 2>error2 &&
 143        grep "No rebase in progress" error2 &&
 144        test_must_fail git rebase --onto master 2>error3 &&
 145        grep "[Uu]sage" error3 &&
 146        ! grep "can.t shift" error3
 147'
 148
 149test_expect_success 'rebase -q is quiet' '
 150        git checkout -b quiet topic &&
 151        git rebase -q master >output.out 2>&1 &&
 152        test ! -s output.out
 153'
 154
 155test_expect_success 'Rebase a commit that sprinkles CRs in' '
 156        (
 157                echo "One"
 158                echo "TwoQ"
 159                echo "Three"
 160                echo "FQur"
 161                echo "Five"
 162        ) | q_to_cr >CR &&
 163        git add CR &&
 164        test_tick &&
 165        git commit -a -m "A file with a line with CR" &&
 166        git tag file-with-cr &&
 167        git checkout HEAD^0 &&
 168        git rebase --onto HEAD^^ HEAD^ &&
 169        git diff --exit-code file-with-cr:CR HEAD:CR
 170'
 171
 172test_expect_success 'rebase can copy notes' '
 173        git config notes.rewrite.rebase true &&
 174        git config notes.rewriteRef "refs/notes/*" &&
 175        test_commit n1 &&
 176        test_commit n2 &&
 177        test_commit n3 &&
 178        git notes add -m"a note" n3 &&
 179        git rebase --onto n1 n2 &&
 180        test "a note" = "$(git notes show HEAD)"
 181'
 182
 183test_expect_success 'rebase -m can copy notes' '
 184        git reset --hard n3 &&
 185        git rebase -m --onto n1 n2 &&
 186        test "a note" = "$(git notes show HEAD)"
 187'
 188
 189test_done