t/t2201-rebase-file-dir.sh

   1 #!/bin/sh
   2
   3 test_description='Rebase between trees with a file and a dir with the same name'
   4
   5 . ./test-lib.sh
   6
   7 test_expect_success 'Set up a repo with two branches' '
   8     mkdir x &&
   9     echo "Jag älskar morötter" > x/y &&
  10     git add x/y &&
  11     git commit -m "Commit where x is a directory" &&
  12     git tag x-dir &&
  13     git reset --hard HEAD^ &&
  14     echo "Jag älskar grisfötter" > x &&
  15     git add x &&
  16     git commit -m "Commit where x is a file" &&
  17     git tag x-file &&
  18     stg init
  19 '
  20
  21 test_expect_success 'Rebase from file to dir' '
  22     stg rebase x-dir
  23 '
  24
  25 test_expect_success 'Rebase from dir to file' '
  26     stg rebase x-file
  27 '
  28
  29 test_done