t/t8003-blame-corner-cases.sh

   1 #!/bin/sh
   2
   3 test_description='git blame corner cases'
   4 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
   5 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
   6
   7 TEST_PASSES_SANITIZE_LEAK=true
   8 . ./test-lib.sh
   9
  10 pick_fc='s/^[0-9a-f^]* *\([^ ]*\) *(\([^ ]*\) .*/\1-\2/'
  11
  12 test_expect_success setup '
  13         echo A A A A A >one &&
  14         echo B B B B B >two &&
  15         echo C C C C C >tres &&
  16         echo ABC >mouse &&
  17         test_write_lines 1 2 3 4 5 6 7 8 9 >nine_lines &&
  18         test_write_lines 1 2 3 4 5 6 7 8 9 a >ten_lines &&
  19         git add one two tres mouse nine_lines ten_lines &&
  20         test_tick &&
  21         GIT_AUTHOR_NAME=Initial git commit -m Initial &&
  22
  23         cat one >uno &&
  24         mv two dos &&
  25         cat one >>tres &&
  26         echo DEF >>mouse &&
  27         git add uno dos tres mouse &&
  28         test_tick &&
  29         GIT_AUTHOR_NAME=Second git commit -a -m Second &&
  30
  31         echo GHIJK >>mouse &&
  32         git add mouse &&
  33         test_tick &&
  34         GIT_AUTHOR_NAME=Third git commit -m Third &&
  35
  36         cat mouse >cow &&
  37         git add cow &&
  38         test_tick &&
  39         GIT_AUTHOR_NAME=Fourth git commit -m Fourth &&
  40
  41         cat >cow <<-\EOF &&
  42         ABC
  43         DEF
  44         XXXX
  45         GHIJK
  46         EOF
  47         git add cow &&
  48         test_tick &&
  49         GIT_AUTHOR_NAME=Fifth git commit -m Fifth
  50 '
  51
  52 test_expect_success 'straight copy without -C' '
  53
  54         git blame uno | grep Second
  55
  56 '
  57
  58 test_expect_success 'straight move without -C' '
  59
  60         git blame dos | grep Initial
  61
  62 '
  63
  64 test_expect_success 'straight copy with -C' '
  65
  66         git blame -C1 uno | grep Second
  67
  68 '
  69
  70 test_expect_success 'straight move with -C' '
  71
  72         git blame -C1 dos | grep Initial
  73
  74 '
  75
  76 test_expect_success 'straight copy with -C -C' '
  77
  78         git blame -C -C1 uno | grep Initial
  79
  80 '
  81
  82 test_expect_success 'straight move with -C -C' '
  83
  84         git blame -C -C1 dos | grep Initial
  85
  86 '
  87
  88 test_expect_success 'append without -C' '
  89
  90         git blame -L2 tres | grep Second
  91
  92 '
  93
  94 test_expect_success 'append with -C' '
  95
  96         git blame -L2 -C1 tres | grep Second
  97
  98 '
  99
 100 test_expect_success 'append with -C -C' '
 101
 102         git blame -L2 -C -C1 tres | grep Second
 103
 104 '
 105
 106 test_expect_success 'append with -C -C -C' '
 107
 108         git blame -L2 -C -C -C1 tres | grep Initial
 109
 110 '
 111
 112 test_expect_success 'blame wholesale copy' '
 113
 114         git blame -f -C -C1 HEAD^ -- cow | sed -e "$pick_fc" >current &&
 115         cat >expected <<-\EOF &&
 116         mouse-Initial
 117         mouse-Second
 118         mouse-Third
 119         EOF
 120         test_cmp expected current
 121
 122 '
 123
 124 test_expect_success 'blame wholesale copy and more' '
 125
 126         git blame -f -C -C1 HEAD -- cow | sed -e "$pick_fc" >current &&
 127         cat >expected <<-\EOF &&
 128         mouse-Initial
 129         mouse-Second
 130         cow-Fifth
 131         mouse-Third
 132         EOF
 133         test_cmp expected current
 134
 135 '
 136
 137 test_expect_success 'blame wholesale copy and more in the index' '
 138
 139         cat >horse <<-\EOF &&
 140         ABC
 141         DEF
 142         XXXX
 143         YYYY
 144         GHIJK
 145         EOF
 146         git add horse &&
 147         test_when_finished "git rm -f horse" &&
 148         git blame -f -C -C1 -- horse | sed -e "$pick_fc" >current &&
 149         cat >expected <<-\EOF &&
 150         mouse-Initial
 151         mouse-Second
 152         cow-Fifth
 153         horse-Not
 154         mouse-Third
 155         EOF
 156         test_cmp expected current
 157
 158 '
 159
 160 test_expect_success 'blame during cherry-pick with file rename conflict' '
 161
 162         test_when_finished "git reset --hard && git checkout main" &&
 163         git checkout HEAD~3 &&
 164         echo MOUSE >> mouse &&
 165         git mv mouse rodent &&
 166         git add rodent &&
 167         GIT_AUTHOR_NAME=Rodent git commit -m "rodent" &&
 168         git checkout --detach main &&
 169         (git cherry-pick HEAD@{1} || test $? -eq 1) &&
 170         git show HEAD@{1}:rodent > rodent &&
 171         git add rodent &&
 172         git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
 173         cat >expected <<-\EOF &&
 174         mouse-Initial
 175         mouse-Second
 176         rodent-Not
 177         EOF
 178         test_cmp expected current
 179 '
 180
 181 test_expect_success 'blame path that used to be a directory' '
 182         mkdir path &&
 183         echo A A A A A >path/file &&
 184         echo B B B B B >path/elif &&
 185         git add path &&
 186         test_tick &&
 187         git commit -m "path was a directory" &&
 188         rm -fr path &&
 189         echo A A A A A >path &&
 190         git add path &&
 191         test_tick &&
 192         git commit -m "path is a regular file" &&
 193         git blame HEAD^.. -- path
 194 '
 195
 196 test_expect_success 'blame to a commit with no author name' '
 197   TREE=$(git rev-parse HEAD:) &&
 198   cat >badcommit <<EOF &&
 199 tree $TREE
 200 author <noname> 1234567890 +0000
 201 committer David Reiss <dreiss@facebook.com> 1234567890 +0000
 202
 203 some message
 204 EOF
 205   COMMIT=$(git hash-object --literally -t commit -w badcommit) &&
 206   git --no-pager blame $COMMIT -- uno >/dev/null
 207 '
 208
 209 test_expect_success 'blame -L with invalid start' '
 210         test_must_fail git blame -L5 tres 2>errors &&
 211         test_grep "has only 2 lines" errors
 212 '
 213
 214 test_expect_success 'blame -L with invalid end' '
 215         git blame -L1,5 tres >out &&
 216         test_line_count = 2 out
 217 '
 218
 219 test_expect_success 'blame parses <end> part of -L' '
 220         git blame -L1,1 tres >out &&
 221         test_line_count = 1 out
 222 '
 223
 224 test_expect_success 'blame -Ln,-(n+1)' '
 225         git blame -L3,-4 nine_lines >out &&
 226         test_line_count = 3 out
 227 '
 228
 229 test_expect_success 'indent of line numbers, nine lines' '
 230         git blame nine_lines >actual &&
 231         test $(grep -c "  " actual) = 0
 232 '
 233
 234 test_expect_success 'indent of line numbers, ten lines' '
 235         git blame ten_lines >actual &&
 236         test $(grep -c "  " actual) = 9
 237 '
 238
 239 test_expect_success 'setup file with CRLF newlines' '
 240         git config core.autocrlf false &&
 241         printf "testcase\n" >crlffile &&
 242         git add crlffile &&
 243         git commit -m testcase &&
 244         printf "testcase\r\n" >crlffile
 245 '
 246
 247 test_expect_success 'blame file with CRLF core.autocrlf true' '
 248         git config core.autocrlf true &&
 249         git blame crlffile >actual &&
 250         grep "A U Thor" actual
 251 '
 252
 253 test_expect_success 'blame file with CRLF attributes text' '
 254         git config core.autocrlf false &&
 255         echo "crlffile text" >.gitattributes &&
 256         git blame crlffile >actual &&
 257         grep "A U Thor" actual
 258 '
 259
 260 test_expect_success 'blame file with CRLF core.autocrlf=true' '
 261         git config core.autocrlf false &&
 262         printf "testcase\r\n" >crlfinrepo &&
 263         >.gitattributes &&
 264         git add crlfinrepo &&
 265         git commit -m "add crlfinrepo" &&
 266         git config core.autocrlf true &&
 267         mv crlfinrepo tmp &&
 268         git checkout crlfinrepo &&
 269         rm tmp &&
 270         git blame crlfinrepo >actual &&
 271         grep "A U Thor" actual
 272 '
 273
 274 test_expect_success 'setup coalesce tests' '
 275         cat >giraffe <<-\EOF &&
 276         ABC
 277         DEF
 278         EOF
 279         git add giraffe &&
 280         git commit -m "original file" &&
 281         orig=$(git rev-parse HEAD) &&
 282
 283         cat >giraffe <<-\EOF &&
 284         ABC
 285         SPLIT
 286         DEF
 287         EOF
 288         git add giraffe &&
 289         git commit -m "interior SPLIT line" &&
 290         split=$(git rev-parse HEAD) &&
 291
 292         cat >giraffe <<-\EOF &&
 293         ABC
 294         DEF
 295         EOF
 296         git add giraffe &&
 297         git commit -m "same contents as original" &&
 298         final=$(git rev-parse HEAD)
 299 '
 300
 301 test_expect_success 'blame coalesce' '
 302         cat >expect <<-EOF &&
 303         $orig 1 1 2
 304         $orig 2 2
 305         EOF
 306         git blame --porcelain $final giraffe >actual.raw &&
 307         grep "^$orig" actual.raw >actual &&
 308         test_cmp expect actual
 309 '
 310
 311 test_expect_success 'blame does not coalesce non-adjacent result lines' '
 312         cat >expect <<-EOF &&
 313         $orig 1) ABC
 314         $orig 3) DEF
 315         EOF
 316         git blame --no-abbrev -s -L1,1 -L3,3 $split giraffe >actual &&
 317         test_cmp expect actual
 318 '
 319
 320 test_done