t/t6031-merge-recursive.sh

   1 #!/bin/sh
   2
   3 test_description='merge-recursive: handle file mode'
   4 . ./test-lib.sh
   5
   6 test_expect_success 'mode change in one branch: keep changed version' '
   7         : >file1 &&
   8         git add file1 &&
   9         git commit -m initial &&
  10         git checkout -b a1 master &&
  11         : >dummy &&
  12         git add dummy &&
  13         git commit -m a &&
  14         git checkout -b b1 master &&
  15         test_chmod +x file1 &&
  16         git add file1 &&
  17         git commit -m b1 &&
  18         git checkout a1 &&
  19         git merge-recursive master -- a1 b1 &&
  20         git ls-files -s file1 | grep ^100755
  21 '
  22
  23 test_expect_success FILEMODE 'verify executable bit on file' '
  24         test -x file1
  25 '
  26
  27 test_expect_success 'mode change in both branches: expect conflict' '
  28         git reset --hard HEAD &&
  29         git checkout -b a2 master &&
  30         : >file2 &&
  31         H=$(git hash-object file2) &&
  32         test_chmod +x file2 &&
  33         git commit -m a2 &&
  34         git checkout -b b2 master &&
  35         : >file2 &&
  36         git add file2 &&
  37         git commit -m b2 &&
  38         git checkout a2 &&
  39         (
  40                 git merge-recursive master -- a2 b2
  41                 test $? = 1
  42         ) &&
  43         git ls-files -u >actual &&
  44         (
  45                 echo "100755 $H 2       file2"
  46                 echo "100644 $H 3       file2"
  47         ) >expect &&
  48         test_cmp actual expect &&
  49         git ls-files -s file2 | grep ^100755
  50 '
  51
  52 test_expect_success FILEMODE 'verify executable bit on file' '
  53         test -x file2
  54 '
  55
  56 test_expect_success 'merging with triple rename across D/F conflict' '
  57         git reset --hard HEAD &&
  58         git checkout -b main &&
  59         git rm -rf . &&
  60
  61         echo "just a file" >sub1 &&
  62         mkdir -p sub2 &&
  63         echo content1 >sub2/file1 &&
  64         echo content2 >sub2/file2 &&
  65         echo content3 >sub2/file3 &&
  66         mkdir simple &&
  67         echo base >simple/bar &&
  68         git add -A &&
  69         test_tick &&
  70         git commit -m base &&
  71
  72         git checkout -b other &&
  73         echo more >>simple/bar &&
  74         test_tick &&
  75         git commit -a -m changesimplefile &&
  76
  77         git checkout main &&
  78         git rm sub1 &&
  79         git mv sub2 sub1 &&
  80         test_tick &&
  81         git commit -m changefiletodir &&
  82
  83         test_tick &&
  84         git merge other
  85 '
  86
  87 test_done