t/t3409-rebase-preserve-merges.sh

   1 #!/bin/sh
   2 #
   3 # Copyright(C) 2008 Stephen Habermann & Andreas Ericsson
   4 #
   5 test_description='git rebase -p should preserve merges
   6
   7 Run "git rebase -p" and check that merges are properly carried along
   8 '
   9 . ./test-lib.sh
  10
  11 GIT_AUTHOR_EMAIL=bogus_email_address
  12 export GIT_AUTHOR_EMAIL
  13
  14 # Clone 1 (trivial merge):
  15 #
  16 # A1--A2  <-- origin/master
  17 #  \   \
  18 #   B1--M  <-- topic
  19 #    \
  20 #     B2  <-- origin/topic
  21 #
  22 # Clone 2 (conflicting merge):
  23 #
  24 # A1--A2--B3   <-- origin/master
  25 #  \       \
  26 #   B1------M  <-- topic
  27 #    \
  28 #     B2       <-- origin/topic
  29 #
  30 # In both cases, 'topic' is rebased onto 'origin/topic'.
  31
  32 test_expect_success 'setup for merge-preserving rebase' \
  33         'echo First > A &&
  34         git add A &&
  35         git-commit -m "Add A1" &&
  36         git checkout -b topic &&
  37         echo Second > B &&
  38         git add B &&
  39         git-commit -m "Add B1" &&
  40         git checkout -f master &&
  41         echo Third >> A &&
  42         git-commit -a -m "Modify A2" &&
  43
  44         git clone ./. clone1 &&
  45         cd clone1 &&
  46         git checkout -b topic origin/topic &&
  47         git merge origin/master &&
  48         cd .. &&
  49
  50         echo Fifth > B &&
  51         git add B &&
  52         git commit -m "Add different B" &&
  53
  54         git clone ./. clone2 &&
  55         cd clone2 &&
  56         git checkout -b topic origin/topic &&
  57         test_must_fail git merge origin/master &&
  58         echo Resolved > B &&
  59         git add B &&
  60         git commit -m "Merge origin/master into topic" &&
  61         cd .. &&
  62
  63         git checkout topic &&
  64         echo Fourth >> B &&
  65         git commit -a -m "Modify B2"
  66 '
  67
  68 test_expect_success 'rebase -p fakes interactive rebase' '
  69         (
  70         cd clone1 &&
  71         git fetch &&
  72         git rebase -p origin/topic &&
  73         test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
  74         test 1 = $(git rev-list --all --pretty=oneline | grep "Merge commit" | wc -l)
  75         )
  76 '
  77
  78 test_expect_success '--continue works after a conflict' '
  79         (
  80         cd clone2 &&
  81         git fetch &&
  82         test_must_fail git rebase -p origin/topic &&
  83         test 2 = $(git ls-files B | wc -l) &&
  84         echo Resolved again > B &&
  85         test_must_fail git rebase --continue &&
  86         grep "^@@@ " .git/rebase-merge/patch &&
  87         git add B &&
  88         git rebase --continue &&
  89         test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
  90         test 1 = $(git rev-list --all --pretty=oneline | grep "Add different" | wc -l) &&
  91         test 1 = $(git rev-list --all --pretty=oneline | grep "Merge origin" | wc -l)
  92         )
  93 '
  94
  95 test_done