t/t6020-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 "merge msg" B 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         test 1 -eq $(git ls-files -o | wc -l) &&
  85
  86         test -f letters/file &&
  87         test -f letters.txt &&
  88         test -f letters~modify
  89 '
  90
  91 test_expect_success 'modify/delete + directory/file conflict; other way' '
  92         # Yes, we really need the double reset since "letters" appears as
  93         # both a file and a directory.
  94         git reset --hard &&
  95         git reset --hard &&
  96         git clean -f &&
  97         git checkout modify^0 &&
  98
  99         test_must_fail git merge delete &&
 100
 101         test 5 -eq $(git ls-files -s | wc -l) &&
 102         test 4 -eq $(git ls-files -u | wc -l) &&
 103         test 1 -eq $(git ls-files -o | wc -l) &&
 104
 105         test -f letters/file &&
 106         test -f letters.txt &&
 107         test -f letters~HEAD
 108 '
 109
 110 test_done