Andrew's git - gitweb.git/blob - t/t3403-rebase-skip.sh

   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Eric Wong
   4#
   5
   6test_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
  13test_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
  34test_expect_success 'rebase with git am -3 (default)' '
  35        test_must_fail git rebase master
  36'
  37
  38test_expect_success 'rebase --skip can not be used with other options' '
  39        test_must_fail git rebase -v --skip &&
  40        test_must_fail git rebase --skip -v
  41'
  42
  43test_expect_success 'rebase --skip with am -3' '
  44        git rebase --skip
  45        '
  46
  47test_expect_success 'rebase moves back to skip-reference' '
  48        test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
  49        git branch post-rebase &&
  50        git reset --hard pre-rebase &&
  51        test_must_fail git rebase master &&
  52        echo "hello" > hello &&
  53        git add hello &&
  54        git rebase --continue &&
  55        test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
  56        git reset --hard post-rebase
  57'
  58
  59test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
  60
  61test_expect_success 'rebase with --merge' '
  62        test_must_fail git rebase --merge master
  63'
  64
  65test_expect_success 'rebase --skip with --merge' '
  66        git rebase --skip
  67        '
  68
  69test_expect_success 'merge and reference trees equal' \
  70        'test -z "`git diff-tree skip-merge skip-reference`"'
  71
  72test_expect_success 'moved back to branch correctly' '
  73        test refs/heads/skip-merge = $(git symbolic-ref HEAD)
  74'
  75
  76test_debug 'gitk --all & sleep 1'
  77
  78test_done