t/t3417-rebase-whitespace-fix.sh

   1 #!/bin/sh
   2
   3 test_description='git rebase --whitespace=fix
   4
   5 This test runs git rebase --whitespace=fix and make sure that it works.
   6 '
   7
   8 TEST_PASSES_SANITIZE_LEAK=true
   9 . ./test-lib.sh
  10
  11 # prepare initial revision of "file" with a blank line at the end
  12 cat >file <<EOF
  13 a
  14 b
  15 c
  16
  17 EOF
  18
  19 # expected contents in "file" after rebase
  20 cat >expect-first <<EOF
  21 a
  22 b
  23 c
  24 EOF
  25
  26 # prepare second revision of "file"
  27 cat >second <<EOF
  28 a
  29 b
  30 c
  31
  32 d
  33 e
  34 f
  35
  36
  37
  38
  39 EOF
  40
  41 # expected contents in second revision after rebase
  42 cat >expect-second <<EOF
  43 a
  44 b
  45 c
  46
  47 d
  48 e
  49 f
  50 EOF
  51
  52 test_expect_success 'blank line at end of file; extend at end of file' '
  53         git commit --allow-empty -m "Initial empty commit" &&
  54         git add file && git commit -m first &&
  55         mv second file &&
  56         git add file && git commit -m second &&
  57         git rebase --whitespace=fix HEAD^^ &&
  58         git diff --exit-code HEAD^:file expect-first &&
  59         test_cmp expect-second file
  60 '
  61
  62 # prepare third revision of "file"
  63 sed -e's/Z//' >third <<EOF
  64 a
  65 b
  66 c
  67
  68 d
  69 e
  70 f
  71     Z
  72  Z
  73 h
  74 i
  75 j
  76 k
  77 l
  78 EOF
  79
  80 sed -e's/ //g' <third >expect-third
  81
  82 test_expect_success 'two blanks line at end of file; extend at end of file' '
  83         cp third file && git add file && git commit -m third &&
  84         git rebase --whitespace=fix HEAD^^ &&
  85         git diff --exit-code HEAD^:file expect-second &&
  86         test_cmp expect-third file
  87 '
  88
  89 test_expect_success 'same, but do not remove trailing spaces' '
  90         git config core.whitespace "-blank-at-eol" &&
  91         git reset --hard HEAD^ &&
  92         cp third file && git add file && git commit -m third &&
  93         git rebase --whitespace=fix HEAD^^ &&
  94         git diff --exit-code HEAD^:file expect-second &&
  95         test_cmp file third
  96 '
  97
  98 sed -e's/Z//' >beginning <<EOF
  99 a
 100                     Z
 101        Z
 102 EOF
 103
 104 cat >expect-beginning <<EOF
 105 a
 106
 107
 108 1
 109 2
 110 3
 111 4
 112 5
 113 EOF
 114
 115 test_expect_success 'at beginning of file' '
 116         git config core.whitespace "blank-at-eol" &&
 117         cp beginning file &&
 118         git commit -m beginning file &&
 119         test_write_lines 1 2 3 4 5 >>file &&
 120         git commit -m more file &&
 121         git rebase --whitespace=fix HEAD^^ &&
 122         test_cmp expect-beginning file
 123 '
 124
 125 test_done