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