Andrew's git / gitweb.git / t/t4013-diff-various.sh
?
t / t4013-diff-various.shon commit Merge remote branch 'ko/master' into HEAD (44148f2)
   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        git show-branch
  84'
  85
  86: <<\EOF
  87! [initial] Initial
  88 * [master] Merge branch 'side'
  89  ! [side] Side
  90---
  91 -  [master] Merge branch 'side'
  92 *+ [side] Side
  93 *  [master^] Second
  94+*+ [initial] Initial
  95EOF
  96
  97V=`git version | sed -e 's/^git version //' -e 's/\./\\./g'`
  98while read cmd
  99do
 100        case "$cmd" in
 101        '' | '#'*) continue ;;
 102        esac
 103        test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
 104        pfx=`printf "%04d" $test_count`
 105        expect="$TEST_DIRECTORY/t4013/diff.$test"
 106        actual="$pfx-diff.$test"
 107
 108        test_expect_success "git $cmd" '
 109                {
 110                        echo "\$ git $cmd"
 111                        git $cmd |
 112                        sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
 113                            -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
 114                        echo "\$"
 115                } >"$actual" &&
 116                if test -f "$expect"
 117                then
 118                        test_cmp "$expect" "$actual" &&
 119                        rm -f "$actual"
 120                else
 121                        # this is to help developing new tests.
 122                        cp "$actual" "$expect"
 123                        false
 124                fi
 125        '
 126done <<\EOF
 127diff-tree initial
 128diff-tree -r initial
 129diff-tree -r --abbrev initial
 130diff-tree -r --abbrev=4 initial
 131diff-tree --root initial
 132diff-tree --root --abbrev initial
 133diff-tree --root -r initial
 134diff-tree --root -r --abbrev initial
 135diff-tree --root -r --abbrev=4 initial
 136diff-tree -p initial
 137diff-tree --root -p initial
 138diff-tree --patch-with-stat initial
 139diff-tree --root --patch-with-stat initial
 140diff-tree --patch-with-raw initial
 141diff-tree --root --patch-with-raw initial
 142
 143diff-tree --pretty initial
 144diff-tree --pretty --root initial
 145diff-tree --pretty -p initial
 146diff-tree --pretty --stat initial
 147diff-tree --pretty --summary initial
 148diff-tree --pretty --stat --summary initial
 149diff-tree --pretty --root -p initial
 150diff-tree --pretty --root --stat initial
 151# improved by Timo's patch
 152diff-tree --pretty --root --summary initial
 153# improved by Timo's patch
 154diff-tree --pretty --root --summary -r initial
 155diff-tree --pretty --root --stat --summary initial
 156diff-tree --pretty --patch-with-stat initial
 157diff-tree --pretty --root --patch-with-stat initial
 158diff-tree --pretty --patch-with-raw initial
 159diff-tree --pretty --root --patch-with-raw initial
 160
 161diff-tree --pretty=oneline initial
 162diff-tree --pretty=oneline --root initial
 163diff-tree --pretty=oneline -p initial
 164diff-tree --pretty=oneline --root -p initial
 165diff-tree --pretty=oneline --patch-with-stat initial
 166# improved by Timo's patch
 167diff-tree --pretty=oneline --root --patch-with-stat initial
 168diff-tree --pretty=oneline --patch-with-raw initial
 169diff-tree --pretty=oneline --root --patch-with-raw initial
 170
 171diff-tree --pretty side
 172diff-tree --pretty -p side
 173diff-tree --pretty --patch-with-stat side
 174
 175diff-tree master
 176diff-tree -p master
 177diff-tree -p -m master
 178diff-tree -c master
 179diff-tree -c --abbrev master
 180diff-tree --cc master
 181# stat only should show the diffstat with the first parent
 182diff-tree -c --stat master
 183diff-tree --cc --stat master
 184diff-tree -c --stat --summary master
 185diff-tree --cc --stat --summary master
 186# stat summary should show the diffstat and summary with the first parent
 187diff-tree -c --stat --summary side
 188diff-tree --cc --stat --summary side
 189# improved by Timo's patch
 190diff-tree --cc --patch-with-stat master
 191# improved by Timo's patch
 192diff-tree --cc --patch-with-stat --summary master
 193# this is correct
 194diff-tree --cc --patch-with-stat --summary side
 195
 196log master
 197log -p master
 198log --root master
 199log --root -p master
 200log --patch-with-stat master
 201log --root --patch-with-stat master
 202log --root --patch-with-stat --summary master
 203# improved by Timo's patch
 204log --root -c --patch-with-stat --summary master
 205# improved by Timo's patch
 206log --root --cc --patch-with-stat --summary master
 207log -SF master
 208log -SF -p master
 209log --decorate --all
 210log --decorate=full --all
 211
 212rev-list --parents HEAD
 213rev-list --children HEAD
 214
 215whatchanged master
 216whatchanged -p master
 217whatchanged --root master
 218whatchanged --root -p master
 219whatchanged --patch-with-stat master
 220whatchanged --root --patch-with-stat master
 221whatchanged --root --patch-with-stat --summary master
 222# improved by Timo's patch
 223whatchanged --root -c --patch-with-stat --summary master
 224# improved by Timo's patch
 225whatchanged --root --cc --patch-with-stat --summary master
 226whatchanged -SF master
 227whatchanged -SF -p master
 228
 229log --patch-with-stat master -- dir/
 230whatchanged --patch-with-stat master -- dir/
 231log --patch-with-stat --summary master -- dir/
 232whatchanged --patch-with-stat --summary master -- dir/
 233
 234show initial
 235show --root initial
 236show side
 237show master
 238show --stat side
 239show --stat --summary side
 240show --patch-with-stat side
 241show --patch-with-raw side
 242show --patch-with-stat --summary side
 243
 244format-patch --stdout initial..side
 245format-patch --stdout initial..master^
 246format-patch --stdout initial..master
 247format-patch --stdout --no-numbered initial..master
 248format-patch --stdout --numbered initial..master
 249format-patch --attach --stdout initial..side
 250format-patch --attach --stdout --suffix=.diff initial..side
 251format-patch --attach --stdout initial..master^
 252format-patch --attach --stdout initial..master
 253format-patch --inline --stdout initial..side
 254format-patch --inline --stdout initial..master^
 255format-patch --inline --stdout --numbered-files initial..master
 256format-patch --inline --stdout initial..master
 257format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
 258config format.subjectprefix DIFFERENT_PREFIX
 259format-patch --inline --stdout initial..master^^
 260format-patch --stdout --cover-letter -n initial..master^
 261
 262diff --abbrev initial..side
 263diff -r initial..side
 264diff --stat initial..side
 265diff -r --stat initial..side
 266diff initial..side
 267diff --patch-with-stat initial..side
 268diff --patch-with-raw initial..side
 269diff --patch-with-stat -r initial..side
 270diff --patch-with-raw -r initial..side
 271diff --name-status dir2 dir
 272diff --no-index --name-status dir2 dir
 273diff --no-index --name-status -- dir2 dir
 274diff --no-index dir dir3
 275diff master master^ side
 276diff --dirstat master~1 master~2
 277EOF
 278
 279test_done