t/t4013-diff-various.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Junio C Hamano
   4 #
   5
   6 test_description='Various diff formatting options'
   7
   8 . ./test-lib.sh
   9
  10 test_expect_success setup '
  11
  12         GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
  13         GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
  14         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  15
  16         mkdir dir &&
  17         for i in 1 2 3; do echo $i; done >file0 &&
  18         for i in A B; do echo $i; done >dir/sub &&
  19         cat file0 >file2 &&
  20         git add file0 file2 dir/sub &&
  21         git commit -m Initial &&
  22
  23         git branch initial &&
  24         git branch side &&
  25
  26         GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
  27         GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
  28         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  29
  30         for i in 4 5 6; do echo $i; done >>file0 &&
  31         for i in C D; do echo $i; done >>dir/sub &&
  32         rm -f file2 &&
  33         git update-index --remove file0 file2 dir/sub &&
  34         git commit -m Second &&
  35
  36         GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
  37         GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
  38         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  39
  40         for i in A B C; do echo $i; done >file1 &&
  41         git add file1 &&
  42         for i in E F; do echo $i; done >>dir/sub &&
  43         git update-index dir/sub &&
  44         git commit -m Third &&
  45
  46         GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
  47         GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
  48         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  49
  50         git checkout side &&
  51         for i in A B C; do echo $i; done >>file0 &&
  52         for i in 1 2; do echo $i; done >>dir/sub &&
  53         cat dir/sub >file3 &&
  54         git add file3 &&
  55         git update-index file0 dir/sub &&
  56         git commit -m Side &&
  57
  58         GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
  59         GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
  60         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  61
  62         git checkout master &&
  63         git pull -s ours . side &&
  64
  65         GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
  66         GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
  67         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  68
  69         for i in A B C; do echo $i; done >>file0 &&
  70         for i in 1 2; do echo $i; done >>dir/sub &&
  71         git update-index file0 dir/sub &&
  72
  73         EDITOR=: VISUAL=: git commit --amend &&
  74         git show-branch
  75 '
  76
  77 : <<\EOF
  78 ! [initial] Initial
  79  * [master] Merge branch 'side'
  80   ! [side] Side
  81 ---
  82  -  [master] Merge branch 'side'
  83  *+ [side] Side
  84  *  [master^] Second
  85 +*+ [initial] Initial
  86 EOF
  87
  88 V=`git version | sed -e 's/^git version //'`
  89 while read cmd
  90 do
  91         case "$cmd" in
  92         '' | '#'*) continue ;;
  93         esac
  94         test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
  95         cnt=`expr $test_count + 1`
  96         pfx=`printf "%04d" $cnt`
  97         expect="../t4013/diff.$test"
  98         actual="$pfx-diff.$test"
  99
 100         test_expect_success "git $cmd" '
 101                 {
 102                         echo "\$ git $cmd"
 103                         git $cmd | sed -e "s/$V/g-i-t--v-e-r-s-i-o-n/"
 104                         echo "\$"
 105                 } >"$actual" &&
 106                 if test -f "$expect"
 107                 then
 108                         diff -u "$expect" "$actual" &&
 109                         rm -f "$actual"
 110                 else
 111                         # this is to help developing new tests.
 112                         cp "$actual" "$expect"
 113                         false
 114                 fi
 115         '
 116 done <<\EOF
 117 diff-tree initial
 118 diff-tree -r initial
 119 diff-tree -r --abbrev initial
 120 diff-tree -r --abbrev=4 initial
 121 diff-tree --root initial
 122 diff-tree --root --abbrev initial
 123 diff-tree --root -r initial
 124 diff-tree --root -r --abbrev initial
 125 diff-tree --root -r --abbrev=4 initial
 126 diff-tree -p initial
 127 diff-tree --root -p initial
 128 diff-tree --patch-with-stat initial
 129 diff-tree --root --patch-with-stat initial
 130 diff-tree --patch-with-raw initial
 131 diff-tree --root --patch-with-raw initial
 132
 133 diff-tree --pretty initial
 134 diff-tree --pretty --root initial
 135 diff-tree --pretty -p initial
 136 diff-tree --pretty --stat initial
 137 diff-tree --pretty --summary initial
 138 diff-tree --pretty --stat --summary initial
 139 diff-tree --pretty --root -p initial
 140 diff-tree --pretty --root --stat initial
 141 #diff-tree --pretty --root --summary initial
 142 diff-tree --pretty --root --stat --summary initial
 143 diff-tree --pretty --patch-with-stat initial
 144 diff-tree --pretty --root --patch-with-stat initial
 145 diff-tree --pretty --patch-with-raw initial
 146 diff-tree --pretty --root --patch-with-raw initial
 147
 148 diff-tree --pretty=oneline initial
 149 diff-tree --pretty=oneline --root initial
 150 diff-tree --pretty=oneline -p initial
 151 diff-tree --pretty=oneline --root -p initial
 152 diff-tree --pretty=oneline --patch-with-stat initial
 153 diff-tree --pretty=oneline --root --patch-with-stat initial
 154 diff-tree --pretty=oneline --patch-with-raw initial
 155 diff-tree --pretty=oneline --root --patch-with-raw initial
 156
 157 diff-tree --pretty side
 158 diff-tree --pretty -p side
 159 diff-tree --pretty --patch-with-stat side
 160
 161 diff-tree master
 162 diff-tree -p master
 163 diff-tree -p -m master
 164 diff-tree -c master
 165 diff-tree -c --abbrev master
 166 diff-tree --cc master
 167 # stat only should show the diffstat with the first parent
 168 diff-tree -c --stat master
 169 diff-tree --cc --stat master
 170 diff-tree -c --stat --summary master
 171 diff-tree --cc --stat --summary master
 172 # stat summary should show the diffstat and summary with the first parent
 173 diff-tree -c --stat --summary side
 174 diff-tree --cc --stat --summary side
 175 # this one gives an extra newline after stat, which should be removed
 176 # diff-tree --cc --patch-with-stat master
 177 # this one gives an extra newline after stat, which should be removed
 178 # other than that it shows the correct example -- stat and summary are
 179 # against the first parent, and patch-looking combined diff follows.
 180 diff-tree --cc --patch-with-stat --summary master
 181 # this is correct
 182 diff-tree --cc --patch-with-stat --summary side
 183
 184 log master
 185 log -p master
 186 log --root master
 187 log --root -p master
 188 log --patch-with-stat master
 189 log --root --patch-with-stat master
 190 log --root --patch-with-stat --summary master
 191 log --root -c --patch-with-stat --summary master
 192 log --root --cc --patch-with-stat --summary master
 193 log -SF master
 194 log -SF -p master
 195
 196 whatchanged master
 197 whatchanged -p master
 198 whatchanged --root master
 199 whatchanged --root -p master
 200 whatchanged --patch-with-stat master
 201 whatchanged --root --patch-with-stat master
 202 whatchanged --root --patch-with-stat --summary master
 203 whatchanged --root -c --patch-with-stat --summary master
 204 whatchanged --root --cc --patch-with-stat --summary master
 205 whatchanged -SF master
 206 whatchanged -SF -p master
 207
 208 log --patch-with-stat master -- dir/
 209 whatchanged --patch-with-stat master -- dir/
 210 log --patch-with-stat --summary master -- dir/
 211 whatchanged --patch-with-stat --summary master -- dir/
 212
 213 show initial
 214 show --root initial
 215 show side
 216 show master
 217 show --stat side
 218 show --stat --summary side
 219 show --patch-with-stat side
 220 show --patch-with-raw side
 221 show --patch-with-stat --summary side
 222
 223 format-patch --stdout initial..side
 224 format-patch --stdout initial..master^
 225 format-patch --stdout initial..master
 226 format-patch --attach --stdout initial..side
 227 format-patch --attach --stdout initial..master^
 228 format-patch --attach --stdout initial..master
 229
 230 diff --abbrev initial..side
 231 diff -r initial..side
 232 diff --stat initial..side
 233 diff -r --stat initial..side
 234 diff initial..side
 235 diff --patch-with-stat initial..side
 236 diff --patch-with-raw initial..side
 237 diff --patch-with-stat -r initial..side
 238 diff --patch-with-raw -r initial..side
 239 EOF
 240
 241 test_done