mdw@git.distorted.org.uk Git - stgit/blob - t/t2101-pull-policy-pull.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2007 Yann Dirson
   4 #
   5
   6 test_description='Excercise pull-policy "fetch-rebase".'
   7
   8 . ./test-lib.sh
   9
  10 # don't need this repo, but better not drop it, see t1100
  11 #rm -rf .git
  12
  13 # Need a repo to clone
  14 test_create_repo upstream
  15
  16 test_expect_success \
  17     'Setup upstream repo, clone it, and add patches to the clone' \
  18     '
  19     (cd upstream && stg init) &&
  20     stg clone upstream clone &&
  21     (cd clone &&
  22      git config branch.master.stgit.pull-policy pull &&
  23      git config --list &&
  24      stg new c1 -m c1 &&
  25      echo a > file && stg add file && stg refresh
  26     )
  27     '
  28
  29 test_expect_success \
  30     'Add non-rewinding commit upstream and pull it from clone' \
  31     '
  32     (cd upstream && stg new u1 -m u1 &&
  33      echo a > file2 && stg add file2 && stg refresh) &&
  34     (cd clone && stg pull) &&
  35      test -e clone/file2
  36     '
  37
  38 # note: with pre-1.5 Git the clone is not automatically recorded
  39 # as rewinding, and thus heads/origin is not moved, but the stack
  40 # is still correctly rebased
  41
  42 test_expect_success \
  43     'Rewind/rewrite upstream commit and pull it from clone, without --merged' \
  44     '
  45     (cd upstream && echo b >> file2 && stg refresh) &&
  46     (cd clone && conflict_old stg pull)
  47     '
  48
  49 test_expect_success \
  50     '"Solve" the conflict (pretend there is none)' \
  51     '(cd clone &&
  52       stg add file2 && EDITOR=cat git commit)'
  53
  54 test_expect_success \
  55     'Push the stack back' \
  56     '(cd clone && stg push -a)'
  57
  58 test_done