t/t6436-merge-overwrite.sh

   1 #!/bin/sh
   2
   3 test_description='git-merge
   4
   5 Do not overwrite changes.'
   6
   7 . ./test-lib.sh
   8
   9 test_expect_success 'setup' '
  10         test_commit c0 c0.c &&
  11         test_commit c1 c1.c &&
  12         test_commit c1a c1.c "c1 a" &&
  13         git reset --hard c0 &&
  14         test_commit c2 c2.c &&
  15         git reset --hard c0 &&
  16         mkdir sub &&
  17         echo "sub/f" > sub/f &&
  18         mkdir sub2 &&
  19         echo "sub2/f" > sub2/f &&
  20         git add sub/f sub2/f &&
  21         git commit -m sub &&
  22         git tag sub &&
  23         echo "VERY IMPORTANT CHANGES" > important
  24 '
  25
  26 test_expect_success 'will not overwrite untracked file' '
  27         git reset --hard c1 &&
  28         cp important c2.c &&
  29         test_must_fail git merge c2 &&
  30         test_path_is_missing .git/MERGE_HEAD &&
  31         test_cmp important c2.c
  32 '
  33
  34 test_expect_success 'will overwrite tracked file' '
  35         git reset --hard c1 &&
  36         cp important c2.c &&
  37         git add c2.c &&
  38         git commit -m important &&
  39         git checkout c2
  40 '
  41
  42 test_expect_success 'will not overwrite new file' '
  43         git reset --hard c1 &&
  44         cp important c2.c &&
  45         git add c2.c &&
  46         test_must_fail git merge c2 &&
  47         test_path_is_missing .git/MERGE_HEAD &&
  48         test_cmp important c2.c
  49 '
  50
  51 test_expect_success 'will not overwrite staged changes' '
  52         git reset --hard c1 &&
  53         cp important c2.c &&
  54         git add c2.c &&
  55         rm c2.c &&
  56         test_must_fail git merge c2 &&
  57         test_path_is_missing .git/MERGE_HEAD &&
  58         git checkout c2.c &&
  59         test_cmp important c2.c
  60 '
  61
  62 test_expect_success 'will not overwrite removed file' '
  63         git reset --hard c1 &&
  64         git rm c1.c &&
  65         git commit -m "rm c1.c" &&
  66         cp important c1.c &&
  67         test_must_fail git merge c1a &&
  68         test_cmp important c1.c
  69 '
  70
  71 test_expect_success 'will not overwrite re-added file' '
  72         git reset --hard c1 &&
  73         git rm c1.c &&
  74         git commit -m "rm c1.c" &&
  75         cp important c1.c &&
  76         git add c1.c &&
  77         test_must_fail git merge c1a &&
  78         test_path_is_missing .git/MERGE_HEAD &&
  79         test_cmp important c1.c
  80 '
  81
  82 test_expect_success 'will not overwrite removed file with staged changes' '
  83         git reset --hard c1 &&
  84         git rm c1.c &&
  85         git commit -m "rm c1.c" &&
  86         cp important c1.c &&
  87         git add c1.c &&
  88         rm c1.c &&
  89         test_must_fail git merge c1a &&
  90         test_path_is_missing .git/MERGE_HEAD &&
  91         git checkout c1.c &&
  92         test_cmp important c1.c
  93 '
  94
  95 test_expect_success 'will not overwrite unstaged changes in renamed file' '
  96         git reset --hard c1 &&
  97         git mv c1.c other.c &&
  98         git commit -m rename &&
  99         cp important other.c &&
 100         if test "$GIT_TEST_MERGE_ALGORITHM" = ort
 101         then
 102                 test_must_fail git merge c1a >out 2>err &&
 103                 test_i18ngrep "would be overwritten by merge" err &&
 104                 test_cmp important other.c &&
 105                 test_path_is_missing .git/MERGE_HEAD
 106         else
 107                 test_must_fail git merge c1a >out &&
 108                 test_i18ngrep "Refusing to lose dirty file at other.c" out &&
 109                 test_path_is_file other.c~HEAD &&
 110                 test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
 111                 test_cmp important other.c
 112         fi
 113 '
 114
 115 test_expect_success 'will not overwrite untracked subtree' '
 116         git reset --hard c0 &&
 117         rm -rf sub &&
 118         mkdir -p sub/f &&
 119         cp important sub/f/important &&
 120         test_must_fail git merge sub &&
 121         test_path_is_missing .git/MERGE_HEAD &&
 122         test_cmp important sub/f/important
 123 '
 124
 125 cat >expect <<\EOF
 126 error: The following untracked working tree files would be overwritten by merge:
 127         sub
 128         sub2
 129 Please move or remove them before you merge.
 130 Aborting
 131 EOF
 132
 133 test_expect_success 'will not overwrite untracked file in leading path' '
 134         git reset --hard c0 &&
 135         rm -rf sub &&
 136         cp important sub &&
 137         cp important sub2 &&
 138         test_must_fail git merge sub 2>out &&
 139         test_i18ncmp out expect &&
 140         test_path_is_missing .git/MERGE_HEAD &&
 141         test_cmp important sub &&
 142         test_cmp important sub2 &&
 143         rm -f sub sub2
 144 '
 145
 146 test_expect_success SYMLINKS 'will not overwrite untracked symlink in leading path' '
 147         git reset --hard c0 &&
 148         rm -rf sub &&
 149         mkdir sub2 &&
 150         ln -s sub2 sub &&
 151         test_must_fail git merge sub &&
 152         test_path_is_missing .git/MERGE_HEAD
 153 '
 154
 155 test_expect_success 'will not be confused by symlink in leading path' '
 156         git reset --hard c0 &&
 157         rm -rf sub &&
 158         test_ln_s_add sub2 sub &&
 159         git commit -m ln &&
 160         git checkout sub
 161 '
 162
 163 cat >expect <<\EOF
 164 error: Untracked working tree file 'c0.c' would be overwritten by merge.
 165 fatal: read-tree failed
 166 EOF
 167
 168 test_expect_success 'will not overwrite untracked file on unborn branch' '
 169         git reset --hard c0 &&
 170         git rm -fr . &&
 171         git checkout --orphan new &&
 172         cp important c0.c &&
 173         test_must_fail git merge c0 2>out &&
 174         test_i18ncmp out expect
 175 '
 176
 177 test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
 178         test_when_finished "rm c0.c" &&
 179         test_path_is_missing .git/MERGE_HEAD &&
 180         test_cmp important c0.c
 181 '
 182
 183 test_expect_success 'failed merge leaves unborn branch in the womb' '
 184         test_must_fail git rev-parse --verify HEAD
 185 '
 186
 187 test_expect_success 'set up unborn branch and content' '
 188         git symbolic-ref HEAD refs/heads/unborn &&
 189         rm -f .git/index &&
 190         echo foo > tracked-file &&
 191         git add tracked-file &&
 192         echo bar > untracked-file
 193 '
 194
 195 test_expect_success 'will not clobber WT/index when merging into unborn' '
 196         git merge master &&
 197         grep foo tracked-file &&
 198         git show :tracked-file >expect &&
 199         grep foo expect &&
 200         grep bar untracked-file
 201 '
 202
 203 test_done