Andrew's git / gitweb.git / t/t4013-diff-various.sh
?
t / t4013-diff-various.shon commit Merge branch 'nk/ref-doc' into maint (3503b8d)
   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Junio C Hamano
   4#
   5
   6test_description='Various diff formatting options'
   7
   8. ./test-lib.sh
   9
  10LF='
  11'
  12
  13test_expect_success setup '
  14
  15        GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
  16        GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
  17        export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  18
  19        mkdir dir &&
  20        mkdir dir2 &&
  21        for i in 1 2 3; do echo $i; done >file0 &&
  22        for i in A B; do echo $i; done >dir/sub &&
  23        cat file0 >file2 &&
  24        git add file0 file2 dir/sub &&
  25        git commit -m Initial &&
  26
  27        git branch initial &&
  28        git branch side &&
  29
  30        GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
  31        GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
  32        export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  33
  34        for i in 4 5 6; do echo $i; done >>file0 &&
  35        for i in C D; do echo $i; done >>dir/sub &&
  36        rm -f file2 &&
  37        git update-index --remove file0 file2 dir/sub &&
  38        git commit -m "Second${LF}${LF}This is the second commit." &&
  39
  40        GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
  41        GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
  42        export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  43
  44        for i in A B C; do echo $i; done >file1 &&
  45        git add file1 &&
  46        for i in E F; do echo $i; done >>dir/sub &&
  47        git update-index dir/sub &&
  48        git commit -m Third &&
  49
  50        GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
  51        GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
  52        export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  53
  54        git checkout side &&
  55        for i in A B C; do echo $i; done >>file0 &&
  56        for i in 1 2; do echo $i; done >>dir/sub &&
  57        cat dir/sub >file3 &&
  58        git add file3 &&
  59        git update-index file0 dir/sub &&
  60        git commit -m Side &&
  61
  62        GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
  63        GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
  64        export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  65
  66        git checkout master &&
  67        git pull -s ours . side &&
  68
  69        GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
  70        GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
  71        export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  72
  73        for i in A B C; do echo $i; done >>file0 &&
  74        for i in 1 2; do echo $i; done >>dir/sub &&
  75        git update-index file0 dir/sub &&
  76
  77        mkdir dir3 &&
  78        cp dir/sub dir3/sub &&
  79        test-chmtime +1 dir3/sub &&
  80
  81        git config log.showroot false &&
  82        git commit --amend &&
  83
  84        GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
  85        GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
  86        export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  87        git checkout -b rearrange initial &&
  88        for i in B A; do echo $i; done >dir/sub &&
  89        git add dir/sub &&
  90        git commit -m "Rearranged lines in dir/sub" &&
  91        git checkout master &&
  92
  93        git show-branch
  94'
  95
  96: <<\EOF
  97! [initial] Initial
  98 * [master] Merge branch 'side'
  99  ! [rearrange] Rearranged lines in dir/sub
 100   ! [side] Side
 101----
 102  +  [rearrange] Rearranged lines in dir/sub
 103 -   [master] Merge branch 'side'
 104 * + [side] Side
 105 *   [master^] Third
 106 *   [master~2] Second
 107+*++ [initial] Initial
 108EOF
 109
 110V=`git version | sed -e 's/^git version //' -e 's/\./\\./g'`
 111while read cmd
 112do
 113        case "$cmd" in
 114        '' | '#'*) continue ;;
 115        esac
 116        test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
 117        pfx=`printf "%04d" $test_count`
 118        expect="$TEST_DIRECTORY/t4013/diff.$test"
 119        actual="$pfx-diff.$test"
 120
 121        test_expect_success "git $cmd" '
 122                {
 123                        echo "\$ git $cmd"
 124                        git $cmd |
 125                        sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
 126                            -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
 127                        echo "\$"
 128                } >"$actual" &&
 129                if test -f "$expect"
 130                then
 131                        test_cmp "$expect" "$actual" &&
 132                        rm -f "$actual"
 133                else
 134                        # this is to help developing new tests.
 135                        cp "$actual" "$expect"
 136                        false
 137                fi
 138        '
 139done <<\EOF
 140diff-tree initial
 141diff-tree -r initial
 142diff-tree -r --abbrev initial
 143diff-tree -r --abbrev=4 initial
 144diff-tree --root initial
 145diff-tree --root --abbrev initial
 146diff-tree --root -r initial
 147diff-tree --root -r --abbrev initial
 148diff-tree --root -r --abbrev=4 initial
 149diff-tree -p initial
 150diff-tree --root -p initial
 151diff-tree --patch-with-stat initial
 152diff-tree --root --patch-with-stat initial
 153diff-tree --patch-with-raw initial
 154diff-tree --root --patch-with-raw initial
 155
 156diff-tree --pretty initial
 157diff-tree --pretty --root initial
 158diff-tree --pretty -p initial
 159diff-tree --pretty --stat initial
 160diff-tree --pretty --summary initial
 161diff-tree --pretty --stat --summary initial
 162diff-tree --pretty --root -p initial
 163diff-tree --pretty --root --stat initial
 164# improved by Timo's patch
 165diff-tree --pretty --root --summary initial
 166# improved by Timo's patch
 167diff-tree --pretty --root --summary -r initial
 168diff-tree --pretty --root --stat --summary initial
 169diff-tree --pretty --patch-with-stat initial
 170diff-tree --pretty --root --patch-with-stat initial
 171diff-tree --pretty --patch-with-raw initial
 172diff-tree --pretty --root --patch-with-raw initial
 173
 174diff-tree --pretty=oneline initial
 175diff-tree --pretty=oneline --root initial
 176diff-tree --pretty=oneline -p initial
 177diff-tree --pretty=oneline --root -p initial
 178diff-tree --pretty=oneline --patch-with-stat initial
 179# improved by Timo's patch
 180diff-tree --pretty=oneline --root --patch-with-stat initial
 181diff-tree --pretty=oneline --patch-with-raw initial
 182diff-tree --pretty=oneline --root --patch-with-raw initial
 183
 184diff-tree --pretty side
 185diff-tree --pretty -p side
 186diff-tree --pretty --patch-with-stat side
 187
 188diff-tree master
 189diff-tree -p master
 190diff-tree -p -m master
 191diff-tree -c master
 192diff-tree -c --abbrev master
 193diff-tree --cc master
 194# stat only should show the diffstat with the first parent
 195diff-tree -c --stat master
 196diff-tree --cc --stat master
 197diff-tree -c --stat --summary master
 198diff-tree --cc --stat --summary master
 199# stat summary should show the diffstat and summary with the first parent
 200diff-tree -c --stat --summary side
 201diff-tree --cc --stat --summary side
 202# improved by Timo's patch
 203diff-tree --cc --patch-with-stat master
 204# improved by Timo's patch
 205diff-tree --cc --patch-with-stat --summary master
 206# this is correct
 207diff-tree --cc --patch-with-stat --summary side
 208
 209log master
 210log -p master
 211log --root master
 212log --root -p master
 213log --patch-with-stat master
 214log --root --patch-with-stat master
 215log --root --patch-with-stat --summary master
 216# improved by Timo's patch
 217log --root -c --patch-with-stat --summary master
 218# improved by Timo's patch
 219log --root --cc --patch-with-stat --summary master
 220log -p --first-parent master
 221log -m -p --first-parent master
 222log -m -p master
 223log -SF master
 224log -S F master
 225log -SF -p master
 226log -SF master --max-count=0
 227log -SF master --max-count=1
 228log -SF master --max-count=2
 229log -GF master
 230log -GF -p master
 231log -GF -p --pickaxe-all master
 232log --decorate --all
 233log --decorate=full --all
 234
 235rev-list --parents HEAD
 236rev-list --children HEAD
 237
 238whatchanged master
 239whatchanged -p master
 240whatchanged --root master
 241whatchanged --root -p master
 242whatchanged --patch-with-stat master
 243whatchanged --root --patch-with-stat master
 244whatchanged --root --patch-with-stat --summary master
 245# improved by Timo's patch
 246whatchanged --root -c --patch-with-stat --summary master
 247# improved by Timo's patch
 248whatchanged --root --cc --patch-with-stat --summary master
 249whatchanged -SF master
 250whatchanged -SF -p master
 251
 252log --patch-with-stat master -- dir/
 253whatchanged --patch-with-stat master -- dir/
 254log --patch-with-stat --summary master -- dir/
 255whatchanged --patch-with-stat --summary master -- dir/
 256
 257show initial
 258show --root initial
 259show side
 260show master
 261show -c master
 262show -m master
 263show --first-parent master
 264show --stat side
 265show --stat --summary side
 266show --patch-with-stat side
 267show --patch-with-raw side
 268show --patch-with-stat --summary side
 269
 270format-patch --stdout initial..side
 271format-patch --stdout initial..master^
 272format-patch --stdout initial..master
 273format-patch --stdout --no-numbered initial..master
 274format-patch --stdout --numbered initial..master
 275format-patch --attach --stdout initial..side
 276format-patch --attach --stdout --suffix=.diff initial..side
 277format-patch --attach --stdout initial..master^
 278format-patch --attach --stdout initial..master
 279format-patch --inline --stdout initial..side
 280format-patch --inline --stdout initial..master^
 281format-patch --inline --stdout --numbered-files initial..master
 282format-patch --inline --stdout initial..master
 283format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
 284config format.subjectprefix DIFFERENT_PREFIX
 285format-patch --inline --stdout initial..master^^
 286format-patch --stdout --cover-letter -n initial..master^
 287
 288diff --abbrev initial..side
 289diff -r initial..side
 290diff --stat initial..side
 291diff -r --stat initial..side
 292diff initial..side
 293diff --patch-with-stat initial..side
 294diff --patch-with-raw initial..side
 295diff --patch-with-stat -r initial..side
 296diff --patch-with-raw -r initial..side
 297diff --name-status dir2 dir
 298diff --no-index --name-status dir2 dir
 299diff --no-index --name-status -- dir2 dir
 300diff --no-index dir dir3
 301diff master master^ side
 302diff --dirstat master~1 master~2
 303diff --dirstat initial rearrange
 304diff --dirstat-by-file initial rearrange
 305EOF
 306
 307test_expect_success 'log -S requires an argument' '
 308        test_must_fail git log -S
 309'
 310
 311test_expect_success 'diff --cached on unborn branch' '
 312        echo ref: refs/heads/unborn >.git/HEAD &&
 313        git diff --cached >result &&
 314        test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached" result
 315'
 316
 317test_expect_success 'diff --cached -- file on unborn branch' '
 318        git diff --cached -- file0 >result &&
 319        test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
 320'
 321
 322test_done