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