t/t3401-rebase-and-am-rename.sh

   1 #!/bin/sh
   2
   3 test_description='git rebase + directory rename tests'
   4
   5 TEST_PASSES_SANITIZE_LEAK=true
   6 . ./test-lib.sh
   7 . "$TEST_DIRECTORY"/lib-rebase.sh
   8
   9 test_expect_success 'setup testcase where directory rename should be detected' '
  10         test_create_repo dir-rename &&
  11         (
  12                 cd dir-rename &&
  13
  14                 mkdir x &&
  15                 test_seq  1 10 >x/a &&
  16                 test_seq 11 20 >x/b &&
  17                 test_seq 21 30 >x/c &&
  18                 test_write_lines a b c d e f g h i >l &&
  19                 git add x l &&
  20                 git commit -m "Initial" &&
  21
  22                 git branch O &&
  23                 git branch A &&
  24                 git branch B &&
  25
  26                 git checkout A &&
  27                 git mv x y &&
  28                 git mv l letters &&
  29                 git commit -m "Rename x to y, l to letters" &&
  30
  31                 git checkout B &&
  32                 echo j >>l &&
  33                 test_seq 31 40 >x/d &&
  34                 git add l x/d &&
  35                 git commit -m "Modify l, add x/d"
  36         )
  37 '
  38
  39 test_expect_success 'rebase --interactive: directory rename detected' '
  40         (
  41                 cd dir-rename &&
  42
  43                 git checkout B^0 &&
  44
  45                 set_fake_editor &&
  46                 FAKE_LINES="1" git -c merge.directoryRenames=true rebase --interactive A &&
  47
  48                 git ls-files -s >out &&
  49                 test_line_count = 5 out &&
  50
  51                 test_path_is_file y/d &&
  52                 test_path_is_missing x/d
  53         )
  54 '
  55
  56 test_expect_failure 'rebase --apply: directory rename detected' '
  57         (
  58                 cd dir-rename &&
  59
  60                 git checkout B^0 &&
  61
  62                 git -c merge.directoryRenames=true rebase --apply A &&
  63
  64                 git ls-files -s >out &&
  65                 test_line_count = 5 out &&
  66
  67                 test_path_is_file y/d &&
  68                 test_path_is_missing x/d
  69         )
  70 '
  71
  72 test_expect_success 'rebase --merge: directory rename detected' '
  73         (
  74                 cd dir-rename &&
  75
  76                 git checkout B^0 &&
  77
  78                 git -c merge.directoryRenames=true rebase --merge A &&
  79
  80                 git ls-files -s >out &&
  81                 test_line_count = 5 out &&
  82
  83                 test_path_is_file y/d &&
  84                 test_path_is_missing x/d
  85         )
  86 '
  87
  88 test_expect_failure 'am: directory rename detected' '
  89         (
  90                 cd dir-rename &&
  91
  92                 git checkout A^0 &&
  93
  94                 git format-patch -1 B &&
  95
  96                 git -c merge.directoryRenames=true am --3way 0001*.patch &&
  97
  98                 git ls-files -s >out &&
  99                 test_line_count = 5 out &&
 100
 101                 test_path_is_file y/d &&
 102                 test_path_is_missing x/d
 103         )
 104 '
 105
 106 test_expect_success 'setup testcase where directory rename should NOT be detected' '
 107         test_create_repo no-dir-rename &&
 108         (
 109                 cd no-dir-rename &&
 110
 111                 mkdir x &&
 112                 test_seq  1 10 >x/a &&
 113                 test_seq 11 20 >x/b &&
 114                 test_seq 21 30 >x/c &&
 115                 echo original >project_info &&
 116                 git add x project_info &&
 117                 git commit -m "Initial" &&
 118
 119                 git branch O &&
 120                 git branch A &&
 121                 git branch B &&
 122
 123                 git checkout A &&
 124                 echo v2 >project_info &&
 125                 git add project_info &&
 126                 git commit -m "Modify project_info" &&
 127
 128                 git checkout B &&
 129                 mkdir y &&
 130                 git mv x/c y/c &&
 131                 echo v1 >project_info &&
 132                 git add project_info &&
 133                 git commit -m "Rename x/c to y/c, modify project_info"
 134         )
 135 '
 136
 137 test_expect_success 'rebase --interactive: NO directory rename' '
 138         test_when_finished "git -C no-dir-rename rebase --abort" &&
 139         (
 140                 cd no-dir-rename &&
 141
 142                 git checkout B^0 &&
 143
 144                 set_fake_editor &&
 145                 test_must_fail env FAKE_LINES="1" git rebase --interactive A &&
 146
 147                 git ls-files -s >out &&
 148                 test_line_count = 6 out &&
 149
 150                 test_path_is_file x/a &&
 151                 test_path_is_file x/b &&
 152                 test_path_is_missing x/c
 153         )
 154 '
 155
 156 test_expect_success 'rebase (am): NO directory rename' '
 157         test_when_finished "git -C no-dir-rename rebase --abort" &&
 158         (
 159                 cd no-dir-rename &&
 160
 161                 git checkout B^0 &&
 162
 163                 set_fake_editor &&
 164                 test_must_fail git rebase A &&
 165
 166                 git ls-files -s >out &&
 167                 test_line_count = 6 out &&
 168
 169                 test_path_is_file x/a &&
 170                 test_path_is_file x/b &&
 171                 test_path_is_missing x/c
 172         )
 173 '
 174
 175 test_expect_success 'rebase --merge: NO directory rename' '
 176         test_when_finished "git -C no-dir-rename rebase --abort" &&
 177         (
 178                 cd no-dir-rename &&
 179
 180                 git checkout B^0 &&
 181
 182                 set_fake_editor &&
 183                 test_must_fail git rebase --merge A &&
 184
 185                 git ls-files -s >out &&
 186                 test_line_count = 6 out &&
 187
 188                 test_path_is_file x/a &&
 189                 test_path_is_file x/b &&
 190                 test_path_is_missing x/c
 191         )
 192 '
 193
 194 test_expect_success 'am: NO directory rename' '
 195         test_when_finished "git -C no-dir-rename am --abort" &&
 196         (
 197                 cd no-dir-rename &&
 198
 199                 git checkout A^0 &&
 200
 201                 git format-patch -1 B &&
 202
 203                 test_must_fail git am --3way 0001*.patch &&
 204
 205                 git ls-files -s >out &&
 206                 test_line_count = 6 out &&
 207
 208                 test_path_is_file x/a &&
 209                 test_path_is_file x/b &&
 210                 test_path_is_missing x/c
 211         )
 212 '
 213
 214 test_done