t/t6400-merge-df.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005 Fredrik Kuivinen
   4 #
   5
   6 test_description='Test merge with directory/file conflicts'
   7 . ./test-lib.sh
   8
   9 test_expect_success 'prepare repository' '
  10         echo Hello >init &&
  11         git add init &&
  12         git commit -m initial &&
  13
  14         git branch B &&
  15         mkdir dir &&
  16         echo foo >dir/foo &&
  17         git add dir/foo &&
  18         git commit -m "File: dir/foo" &&
  19
  20         git checkout B &&
  21         echo file dir >dir &&
  22         git add dir &&
  23         git commit -m "File: dir"
  24 '
  25
  26 test_expect_success 'Merge with d/f conflicts' '
  27         test_expect_code 1 git merge -m "merge msg" master
  28 '
  29
  30 test_expect_success 'F/D conflict' '
  31         git reset --hard &&
  32         git checkout master &&
  33         rm .git/index &&
  34
  35         mkdir before &&
  36         echo FILE >before/one &&
  37         echo FILE >after &&
  38         git add . &&
  39         git commit -m first &&
  40
  41         rm -f after &&
  42         git mv before after &&
  43         git commit -m move &&
  44
  45         git checkout -b para HEAD^ &&
  46         echo COMPLETELY ANOTHER FILE >another &&
  47         git add . &&
  48         git commit -m para &&
  49
  50         git merge master
  51 '
  52
  53 test_expect_success 'setup modify/delete + directory/file conflict' '
  54         git checkout --orphan modify &&
  55         git rm -rf . &&
  56         git clean -fdqx &&
  57
  58         printf "a\nb\nc\nd\ne\nf\ng\nh\n" >letters &&
  59         git add letters &&
  60         git commit -m initial &&
  61
  62         # Throw in letters.txt for sorting order fun
  63         # ("letters.txt" sorts between "letters" and "letters/file")
  64         echo i >>letters &&
  65         echo "version 2" >letters.txt &&
  66         git add letters letters.txt &&
  67         git commit -m modified &&
  68
  69         git checkout -b delete HEAD^ &&
  70         git rm letters &&
  71         mkdir letters &&
  72         >letters/file &&
  73         echo "version 1" >letters.txt &&
  74         git add letters letters.txt &&
  75         git commit -m deleted
  76 '
  77
  78 test_expect_success 'modify/delete + directory/file conflict' '
  79         git checkout delete^0 &&
  80         test_must_fail git merge modify &&
  81
  82         test 5 -eq $(git ls-files -s | wc -l) &&
  83         test 4 -eq $(git ls-files -u | wc -l) &&
  84         if test "$GIT_TEST_MERGE_ALGORITHM" = ort
  85         then
  86                 test 0 -eq $(git ls-files -o | wc -l)
  87         else
  88                 test 1 -eq $(git ls-files -o | wc -l)
  89         fi &&
  90
  91         test_path_is_file letters/file &&
  92         test_path_is_file letters.txt &&
  93         test_path_is_file letters~modify
  94 '
  95
  96 test_expect_success 'modify/delete + directory/file conflict; other way' '
  97         git reset --hard &&
  98         git clean -f &&
  99         git checkout modify^0 &&
 100
 101         test_must_fail git merge delete &&
 102
 103         test 5 -eq $(git ls-files -s | wc -l) &&
 104         test 4 -eq $(git ls-files -u | wc -l) &&
 105         if test "$GIT_TEST_MERGE_ALGORITHM" = ort
 106         then
 107                 test 0 -eq $(git ls-files -o | wc -l)
 108         else
 109                 test 1 -eq $(git ls-files -o | wc -l)
 110         fi &&
 111
 112         test_path_is_file letters/file &&
 113         test_path_is_file letters.txt &&
 114         test_path_is_file letters~HEAD
 115 '
 116
 117 test_expect_success 'Simple merge in repo with interesting pathnames' '
 118         # Simple lexicographic ordering of files and directories would be:
 119         #     foo
 120         #     foo/bar
 121         #     foo/bar-2
 122         #     foo/bar/baz
 123         #     foo/bar-2/baz
 124         # The fact that foo/bar-2 appears between foo/bar and foo/bar/baz
 125         # can trip up some codepaths, and is the point of this test.
 126         test_create_repo name-ordering &&
 127         (
 128                 cd name-ordering &&
 129
 130                 mkdir -p foo/bar &&
 131                 mkdir -p foo/bar-2 &&
 132                 >foo/bar/baz &&
 133                 >foo/bar-2/baz &&
 134                 git add . &&
 135                 git commit -m initial &&
 136
 137                 git branch topic &&
 138                 git branch other &&
 139
 140                 git checkout other &&
 141                 echo other >foo/bar-2/baz &&
 142                 git add -u &&
 143                 git commit -m other &&
 144
 145                 git checkout topic &&
 146                 echo topic >foo/bar/baz &&
 147                 git add -u &&
 148                 git commit -m topic &&
 149
 150                 git merge other &&
 151                 git ls-files -s >out &&
 152                 test_line_count = 2 out &&
 153                 git rev-parse :0:foo/bar/baz :0:foo/bar-2/baz >actual &&
 154                 git rev-parse HEAD~1:foo/bar/baz other:foo/bar-2/baz >expect &&
 155                 test_cmp expect actual
 156         )
 157
 158 '
 159
 160 test_done