t/t4069-remerge-diff.sh

   1 #!/bin/sh
   2
   3 test_description='remerge-diff handling'
   4
   5 TEST_PASSES_SANITIZE_LEAK=true
   6 . ./test-lib.sh
   7
   8 # This test is ort-specific
   9 if test "${GIT_TEST_MERGE_ALGORITHM}" != ort
  10 then
  11         skip_all="GIT_TEST_MERGE_ALGORITHM != ort"
  12         test_done
  13 fi
  14
  15 test_expect_success 'setup basic merges' '
  16         test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
  17         git add numbers &&
  18         git commit -m base &&
  19
  20         git branch feature_a &&
  21         git branch feature_b &&
  22         git branch feature_c &&
  23
  24         git branch ab_resolution &&
  25         git branch bc_resolution &&
  26
  27         git checkout feature_a &&
  28         test_write_lines 1 2 three 4 5 6 7 eight 9 >numbers &&
  29         git commit -a -m change_a &&
  30
  31         git checkout feature_b &&
  32         test_write_lines 1 2 tres 4 5 6 7 8 9 >numbers &&
  33         git commit -a -m change_b &&
  34
  35         git checkout feature_c &&
  36         test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
  37         git commit -a -m change_c &&
  38
  39         git checkout bc_resolution &&
  40         git merge --ff-only feature_b &&
  41         # no conflict
  42         git merge feature_c &&
  43
  44         git checkout ab_resolution &&
  45         git merge --ff-only feature_a &&
  46         # conflicts!
  47         test_must_fail git merge feature_b &&
  48         # Resolve conflict...and make another change elsewhere
  49         test_write_lines 1 2 drei 4 5 6 7 acht 9 >numbers &&
  50         git add numbers &&
  51         git merge --continue
  52 '
  53
  54 test_expect_success 'remerge-diff on a clean merge' '
  55         git log -1 --oneline bc_resolution >expect &&
  56         git show --oneline --remerge-diff bc_resolution >actual &&
  57         test_cmp expect actual
  58 '
  59
  60 test_expect_success 'remerge-diff on a clean merge with a filter' '
  61         git show --oneline --remerge-diff --diff-filter=U bc_resolution >actual &&
  62         test_must_be_empty actual
  63 '
  64
  65 test_expect_success 'remerge-diff with both a resolved conflict and an unrelated change' '
  66         git log -1 --oneline ab_resolution >tmp &&
  67         cat <<-EOF >>tmp &&
  68         diff --git a/numbers b/numbers
  69         remerge CONFLICT (content): Merge conflict in numbers
  70         index a1fb731..6875544 100644
  71         --- a/numbers
  72         +++ b/numbers
  73         @@ -1,13 +1,9 @@
  74          1
  75          2
  76         -<<<<<<< b0ed5cb (change_a)
  77         -three
  78         -=======
  79         -tres
  80         ->>>>>>> 6cd3f82 (change_b)
  81         +drei
  82          4
  83          5
  84          6
  85          7
  86         -eight
  87         +acht
  88          9
  89         EOF
  90         # Hashes above are sha1; rip them out so test works with sha256
  91         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
  92
  93         git show --oneline --remerge-diff ab_resolution >tmp &&
  94         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
  95         test_cmp expect actual
  96 '
  97
  98 test_expect_success 'pickaxe still includes additional headers for relevant changes' '
  99         # reuses "expect" from the previous testcase
 100
 101         git log --oneline --remerge-diff -Sacht ab_resolution >tmp &&
 102         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
 103         test_cmp expect actual
 104 '
 105
 106 test_expect_success 'can filter out additional headers with pickaxe' '
 107         git show --remerge-diff --submodule=log --find-object=HEAD ab_resolution >actual &&
 108         test_must_be_empty actual &&
 109
 110         git show --remerge-diff -S"not present" --all >actual &&
 111         test_must_be_empty actual
 112 '
 113
 114 test_expect_success 'remerge-diff also works for git-diff-tree' '
 115         # With a clean merge
 116         git diff-tree -r -p --remerge-diff --no-commit-id bc_resolution >actual &&
 117         test_must_be_empty actual &&
 118
 119         # With both a resolved conflict and an unrelated change
 120         cat <<-EOF >tmp &&
 121         diff --git a/numbers b/numbers
 122         remerge CONFLICT (content): Merge conflict in numbers
 123         index a1fb731..6875544 100644
 124         --- a/numbers
 125         +++ b/numbers
 126         @@ -1,13 +1,9 @@
 127          1
 128          2
 129         -<<<<<<< b0ed5cb (change_a)
 130         -three
 131         -=======
 132         -tres
 133         ->>>>>>> 6cd3f82 (change_b)
 134         +drei
 135          4
 136          5
 137          6
 138          7
 139         -eight
 140         +acht
 141          9
 142         EOF
 143         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
 144         git diff-tree -r -p --remerge-diff --no-commit-id ab_resolution >tmp &&
 145         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
 146         test_cmp expect actual
 147 '
 148
 149 test_expect_success 'setup non-content conflicts' '
 150         git switch --orphan base &&
 151
 152         test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
 153         test_write_lines a b c d e f g h i >letters &&
 154         test_write_lines in the way >content &&
 155         git add numbers letters content &&
 156         git commit -m base &&
 157
 158         git branch side1 &&
 159         git branch side2 &&
 160
 161         git checkout side1 &&
 162         test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
 163         git mv letters letters_side1 &&
 164         git mv content file_or_directory &&
 165         git add numbers &&
 166         git commit -m side1 &&
 167
 168         git checkout side2 &&
 169         git rm numbers &&
 170         git mv letters letters_side2 &&
 171         mkdir file_or_directory &&
 172         echo hello >file_or_directory/world &&
 173         git add file_or_directory/world &&
 174         git commit -m side2 &&
 175
 176         git checkout -b resolution side1 &&
 177         test_must_fail git merge side2 &&
 178         test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
 179         git add numbers &&
 180         git add letters_side1 &&
 181         git rm letters &&
 182         git rm letters_side2 &&
 183         git add file_or_directory~HEAD &&
 184         git mv file_or_directory~HEAD wanted_content &&
 185         git commit -m resolved
 186 '
 187
 188 test_expect_success 'remerge-diff with non-content conflicts' '
 189         git log -1 --oneline resolution >tmp &&
 190         cat <<-EOF >>tmp &&
 191         diff --git a/file_or_directory~HASH (side1) b/wanted_content
 192         similarity index 100%
 193         rename from file_or_directory~HASH (side1)
 194         rename to wanted_content
 195         remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
 196         diff --git a/letters b/letters
 197         remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
 198         diff --git a/letters_side2 b/letters_side2
 199         deleted file mode 100644
 200         index b236ae5..0000000
 201         --- a/letters_side2
 202         +++ /dev/null
 203         @@ -1,9 +0,0 @@
 204         -a
 205         -b
 206         -c
 207         -d
 208         -e
 209         -f
 210         -g
 211         -h
 212         -i
 213         diff --git a/numbers b/numbers
 214         remerge CONFLICT (modify/delete): numbers deleted in HASH (side2) and modified in HASH (side1).  Version HASH (side1) of numbers left in tree.
 215         EOF
 216         # We still have some sha1 hashes above; rip them out so test works
 217         # with sha256
 218         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
 219
 220         git show --oneline --remerge-diff resolution >tmp &&
 221         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
 222         test_cmp expect actual
 223 '
 224
 225 test_expect_success 'remerge-diff w/ diff-filter=U: all conflict headers, no diff content' '
 226         git log -1 --oneline resolution >tmp &&
 227         cat <<-EOF >>tmp &&
 228         diff --git a/file_or_directory~HASH (side1) b/file_or_directory~HASH (side1)
 229         remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
 230         diff --git a/letters b/letters
 231         remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
 232         diff --git a/numbers b/numbers
 233         remerge CONFLICT (modify/delete): numbers deleted in HASH (side2) and modified in HASH (side1).  Version HASH (side1) of numbers left in tree.
 234         EOF
 235         # We still have some sha1 hashes above; rip them out so test works
 236         # with sha256
 237         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
 238
 239         git show --oneline --remerge-diff --diff-filter=U resolution >tmp &&
 240         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
 241         test_cmp expect actual
 242 '
 243
 244 test_expect_success 'submodule formatting ignores additional headers' '
 245         # Reuses "expect" from last testcase
 246
 247         git show --oneline --remerge-diff --diff-filter=U --submodule=log >tmp &&
 248         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
 249         test_cmp expect actual
 250 '
 251
 252 test_expect_success 'remerge-diff w/ diff-filter=R: relevant file + conflict header' '
 253         git log -1 --oneline resolution >tmp &&
 254         cat <<-EOF >>tmp &&
 255         diff --git a/file_or_directory~HASH (side1) b/wanted_content
 256         similarity index 100%
 257         rename from file_or_directory~HASH (side1)
 258         rename to wanted_content
 259         remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
 260         EOF
 261         # We still have some sha1 hashes above; rip them out so test works
 262         # with sha256
 263         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
 264
 265         git show --oneline --remerge-diff --diff-filter=R resolution >tmp &&
 266         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
 267         test_cmp expect actual
 268 '
 269
 270 test_expect_success 'remerge-diff w/ pathspec: limits to relevant file including conflict header' '
 271         git log -1 --oneline resolution >tmp &&
 272         cat <<-EOF >>tmp &&
 273         diff --git a/letters b/letters
 274         remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
 275         diff --git a/letters_side2 b/letters_side2
 276         deleted file mode 100644
 277         index b236ae5..0000000
 278         --- a/letters_side2
 279         +++ /dev/null
 280         @@ -1,9 +0,0 @@
 281         -a
 282         -b
 283         -c
 284         -d
 285         -e
 286         -f
 287         -g
 288         -h
 289         -i
 290         EOF
 291         # We still have some sha1 hashes above; rip them out so test works
 292         # with sha256
 293         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
 294
 295         git show --oneline --remerge-diff resolution -- "letters*" >tmp &&
 296         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
 297         test_cmp expect actual
 298 '
 299
 300 test_expect_success 'setup non-content conflicts' '
 301         git switch --orphan newbase &&
 302
 303         test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
 304         git add numbers &&
 305         git commit -m base &&
 306
 307         git branch newside1 &&
 308         git branch newside2 &&
 309
 310         git checkout newside1 &&
 311         test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
 312         git add numbers &&
 313         git commit -m side1 &&
 314
 315         git checkout newside2 &&
 316         test_write_lines 1 2 drei 4 5 6 7 8 9 >numbers &&
 317         git add numbers &&
 318         git commit -m side2 &&
 319
 320         git checkout -b newresolution newside1 &&
 321         test_must_fail git merge newside2 &&
 322         git checkout --theirs numbers &&
 323         git add -u numbers &&
 324         git commit -m resolved
 325 '
 326
 327 test_expect_success 'remerge-diff turns off history simplification' '
 328         git log -1 --oneline newresolution >tmp &&
 329         cat <<-EOF >>tmp &&
 330         diff --git a/numbers b/numbers
 331         remerge CONFLICT (content): Merge conflict in numbers
 332         index 070e9e7..5335e78 100644
 333         --- a/numbers
 334         +++ b/numbers
 335         @@ -1,10 +1,6 @@
 336          1
 337          2
 338         -<<<<<<< 96f1e45 (side1)
 339         -three
 340         -=======
 341          drei
 342         ->>>>>>> 4fd522f (side2)
 343          4
 344          5
 345          6
 346         EOF
 347         # We still have some sha1 hashes above; rip them out so test works
 348         # with sha256
 349         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
 350
 351         git show --oneline --remerge-diff newresolution -- numbers >tmp &&
 352         sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
 353         test_cmp expect actual
 354 '
 355
 356 test_done