t/t4017-diff-retval.sh

   1 #!/bin/sh
   2
   3 test_description='Return value of diffs'
   4
   5 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
   6 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
   7
   8 TEST_PASSES_SANITIZE_LEAK=true
   9 . ./test-lib.sh
  10
  11 test_expect_success 'setup' '
  12         echo "1 " >a &&
  13         git add . &&
  14         git commit -m zeroth &&
  15         echo 1 >a &&
  16         git add . &&
  17         git commit -m first &&
  18         echo 2 >b &&
  19         git add . &&
  20         git commit -a -m second
  21 '
  22
  23 test_expect_success 'git diff --quiet -w  HEAD^^ HEAD^' '
  24         git diff --quiet -w HEAD^^ HEAD^
  25 '
  26
  27 test_expect_success 'git diff --quiet HEAD^^ HEAD^' '
  28         test_must_fail git diff --quiet HEAD^^ HEAD^
  29 '
  30
  31 test_expect_success 'git diff --quiet -w  HEAD^ HEAD' '
  32         test_must_fail git diff --quiet -w HEAD^ HEAD
  33 '
  34
  35 test_expect_success 'git diff-tree HEAD^ HEAD' '
  36         test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD
  37 '
  38 test_expect_success 'git diff-tree HEAD^ HEAD -- a' '
  39         git diff-tree --exit-code HEAD^ HEAD -- a
  40 '
  41 test_expect_success 'git diff-tree HEAD^ HEAD -- b' '
  42         test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD -- b
  43 '
  44 test_expect_success 'echo HEAD | git diff-tree --stdin' '
  45         echo $(git rev-parse HEAD) | test_expect_code 1 git diff-tree --exit-code --stdin
  46 '
  47 test_expect_success 'git diff-tree HEAD HEAD' '
  48         git diff-tree --exit-code HEAD HEAD
  49 '
  50 test_expect_success 'git diff-files' '
  51         git diff-files --exit-code
  52 '
  53 test_expect_success 'git diff-index --cached HEAD' '
  54         git diff-index --exit-code --cached HEAD
  55 '
  56 test_expect_success 'git diff-index --cached HEAD^' '
  57         test_expect_code 1 git diff-index --exit-code --cached HEAD^
  58 '
  59 test_expect_success 'git diff-index --cached HEAD^' '
  60         echo text >>b &&
  61         echo 3 >c &&
  62         git add . &&
  63         test_expect_code 1 git diff-index --exit-code --cached HEAD^
  64 '
  65 test_expect_success 'git diff-tree -Stext HEAD^ HEAD -- b' '
  66         git commit -m "text in b" &&
  67         test_expect_code 1 git diff-tree -p --exit-code -Stext HEAD^ HEAD -- b
  68 '
  69 test_expect_success 'git diff-tree -Snot-found HEAD^ HEAD -- b' '
  70         git diff-tree -p --exit-code -Snot-found HEAD^ HEAD -- b
  71 '
  72 test_expect_success 'git diff-files' '
  73         echo 3 >>c &&
  74         test_expect_code 1 git diff-files --exit-code
  75 '
  76 test_expect_success 'git diff-index --cached HEAD' '
  77         git update-index c &&
  78         test_expect_code 1 git diff-index --exit-code --cached HEAD
  79 '
  80
  81 test_expect_success '--check --exit-code returns 0 for no difference' '
  82
  83         git diff --check --exit-code
  84
  85 '
  86
  87 test_expect_success '--check --exit-code returns 1 for a clean difference' '
  88
  89         echo "good" > a &&
  90         test_expect_code 1 git diff --check --exit-code
  91
  92 '
  93
  94 test_expect_success '--check --exit-code returns 3 for a dirty difference' '
  95
  96         echo "bad   " >> a &&
  97         test_expect_code 3 git diff --check --exit-code
  98
  99 '
 100
 101 test_expect_success '--check with --no-pager returns 2 for dirty difference' '
 102
 103         test_expect_code 2 git --no-pager diff --check
 104
 105 '
 106
 107 test_expect_success 'check should test not just the last line' '
 108         echo "" >>a &&
 109         test_expect_code 2 git --no-pager diff --check
 110
 111 '
 112
 113 test_expect_success 'check detects leftover conflict markers' '
 114         git reset --hard &&
 115         git checkout HEAD^ &&
 116         echo binary >>b &&
 117         git commit -m "side" b &&
 118         test_must_fail git merge main &&
 119         git add b &&
 120         test_expect_code 2 git --no-pager diff --cached --check >test.out &&
 121         test 3 = $(grep "conflict marker" test.out | wc -l) &&
 122         git reset --hard
 123 '
 124
 125 test_expect_success 'check honors conflict marker length' '
 126         git reset --hard &&
 127         echo ">>>>>>> boo" >>b &&
 128         echo "======" >>a &&
 129         git diff --check a &&
 130         test_expect_code 2 git diff --check b &&
 131         git reset --hard &&
 132         echo ">>>>>>>> boo" >>b &&
 133         echo "========" >>a &&
 134         git diff --check &&
 135         echo "b conflict-marker-size=8" >.gitattributes &&
 136         test_expect_code 2 git diff --check b &&
 137         git diff --check a &&
 138         git reset --hard
 139 '
 140
 141 test_expect_success 'option errors are not confused by --exit-code' '
 142         test_must_fail git diff --exit-code --nonsense 2>err &&
 143         grep '^usage:' err
 144 '
 145
 146 for option in --exit-code --quiet
 147 do
 148         test_expect_success "git diff $option returns 1 for changed binary file" "
 149                 test_when_finished 'rm -f .gitattributes' &&
 150                 git reset --hard &&
 151                 echo a binary >.gitattributes &&
 152                 echo 2 >>a &&
 153                 test_expect_code 1 git diff $option
 154         "
 155
 156         test_expect_success "git diff $option returns 1 for copied file" "
 157                 git reset --hard &&
 158                 cp a copy &&
 159                 git add copy &&
 160                 test_expect_code 1 git diff $option --cached --find-copies-harder
 161         "
 162
 163         test_expect_success "git diff $option returns 1 for renamed file" "
 164                 git reset --hard &&
 165                 git mv a renamed &&
 166                 test_expect_code 1 git diff $option --cached
 167         "
 168 done
 169
 170 test_expect_success 'setup dirty subrepo' '
 171         git reset --hard &&
 172         test_create_repo subrepo &&
 173         test_commit -C subrepo subrepo-file &&
 174         test_tick &&
 175         git add subrepo &&
 176         git commit -m subrepo &&
 177         test_commit -C subrepo another-subrepo-file
 178 '
 179
 180 for option in --exit-code --quiet
 181 do
 182         for submodule_format in diff log short
 183         do
 184                 opts="$option --submodule=$submodule_format" &&
 185                 test_expect_success "git diff $opts returns 1 for dirty subrepo" "
 186                         test_expect_code 1 git diff $opts
 187                 "
 188         done
 189 done
 190
 191 test_done