t/t3403-rebase-skip.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Eric Wong
   4 #
   5
   6 test_description='git rebase --merge --skip tests'
   7
   8 . ./test-lib.sh
   9
  10 # we assume the default git-am -3 --skip strategy is tested independently
  11 # and always works :)
  12
  13 test_expect_success setup '
  14         echo hello > hello &&
  15         git add hello &&
  16         git commit -m "hello" &&
  17         git branch skip-reference &&
  18
  19         echo world >> hello &&
  20         git commit -a -m "hello world" &&
  21         echo goodbye >> hello &&
  22         git commit -a -m "goodbye" &&
  23
  24         git checkout -f skip-reference &&
  25         echo moo > hello &&
  26         git commit -a -m "we should skip this" &&
  27         echo moo > cow &&
  28         git add cow &&
  29         git commit -m "this should not be skipped" &&
  30         git branch pre-rebase skip-reference &&
  31         git branch skip-merge skip-reference
  32         '
  33
  34 test_expect_failure 'rebase with git am -3 (default)' '
  35         git rebase master
  36 '
  37
  38 test_expect_success 'rebase --skip with am -3' '
  39         git rebase --skip
  40         '
  41
  42 test_expect_success 'rebase moves back to skip-reference' '
  43         test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
  44         git branch post-rebase &&
  45         git reset --hard pre-rebase &&
  46         ! git rebase master &&
  47         echo "hello" > hello &&
  48         git add hello &&
  49         git rebase --continue &&
  50         test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
  51         git reset --hard post-rebase
  52 '
  53
  54 test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
  55
  56 test_expect_failure 'rebase with --merge' 'git rebase --merge master'
  57
  58 test_expect_success 'rebase --skip with --merge' '
  59         git rebase --skip
  60         '
  61
  62 test_expect_success 'merge and reference trees equal' \
  63         'test -z "`git diff-tree skip-merge skip-reference`"'
  64
  65 test_expect_success 'moved back to branch correctly' '
  66         test refs/heads/skip-merge = $(git symbolic-ref HEAD)
  67 '
  68
  69 test_debug 'gitk --all & sleep 1'
  70
  71 test_done