tests/issue/1007

   1 #!/bin/bash
   2 set -ex
   3 tmp=$(mktemp -d)
   4 trap 'rm -rf "$tmp"' EXIT
   5
   6 cd "$tmp"
   7 aur fetch aurutils aurutils-git yuzu
   8
   9 # HEAD on top of master@{u}
  10 cd aurutils
  11 git config --add aurutils.rebase true
  12 echo '# test for issue/1007' >>PKGBUILD
  13 git -c user.name='test' -c user.email='test@localhost' commit -m 'test for issue/1007' PKGBUILD
  14 head1=$(git rev-parse --verify HEAD)
  15
  16 # HEAD is 1 commit behind
  17 cd ../aurutils-git
  18 git reset --hard HEAD^1
  19 head2=$(git rev-parse --verify HEAD)
  20
  21 # HEAD on top of master@{u}^1
  22 cd ../yuzu
  23 git reset --hard HEAD^1
  24 echo '# test for issue/1007' >>PKGBUILD
  25 git -c user.name='test' -c user.email='test@localhost' commit -m 'test for issue/1007' PKGBUILD
  26 head3=$(git rev-parse --verify HEAD)
  27
  28 # merge can be solved as fast-forward
  29 cd ..
  30 aur fetch --sync=auto aurutils aurutils-git
  31 cd aurutils
  32 [[ $(git rev-parse --verify HEAD) == $head1 ]]
  33 cd ../aurutils-git
  34 [[ $(git rev-parse --verify HEAD) != $head2 ]]
  35
  36 # diverging history, --ff-only default
  37 cd ..
  38 aur fetch --sync=auto yuzu || err=$?
  39 (( err == 1 ))
  40 aur fetch --sync=rebase yuzu
  41 cd yuzu
  42 [[ $(git rev-parse --verify HEAD) != $head3 ]]