Andrew's git / gitweb.git / t/t4013-diff-various.sh
?
t / t4013-diff-various.shon commit Fix "git diff blob1 blob2" showing the diff in reverse. (f82cd3c)
   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 commit --amend &&
  77        git show-branch
  78'
  79
  80: <<\EOF
  81! [initial] Initial
  82 * [master] Merge branch 'side'
  83  ! [side] Side
  84---
  85 -  [master] Merge branch 'side'
  86 *+ [side] Side
  87 *  [master^] Second
  88+*+ [initial] Initial
  89EOF
  90
  91V=`git version | sed -e 's/^git version //'`
  92while read cmd
  93do
  94        case "$cmd" in
  95        '' | '#'*) continue ;;
  96        esac
  97        test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
  98        cnt=`expr $test_count + 1`
  99        pfx=`printf "%04d" $cnt`
 100        expect="../t4013/diff.$test"
 101        actual="$pfx-diff.$test"
 102
 103        test_expect_success "git $cmd" '
 104                {
 105                        echo "\$ git $cmd"
 106                        git $cmd | sed -e "s/$V/g-i-t--v-e-r-s-i-o-n/"
 107                        echo "\$"
 108                } >"$actual" &&
 109                if test -f "$expect"
 110                then
 111                        diff -u "$expect" "$actual" &&
 112                        rm -f "$actual"
 113                else
 114                        # this is to help developing new tests.
 115                        cp "$actual" "$expect"
 116                        false
 117                fi
 118        '
 119done <<\EOF
 120diff-tree initial
 121diff-tree -r initial
 122diff-tree -r --abbrev initial
 123diff-tree -r --abbrev=4 initial
 124diff-tree --root initial
 125diff-tree --root --abbrev initial
 126diff-tree --root -r initial
 127diff-tree --root -r --abbrev initial
 128diff-tree --root -r --abbrev=4 initial
 129diff-tree -p initial
 130diff-tree --root -p initial
 131diff-tree --patch-with-stat initial
 132diff-tree --root --patch-with-stat initial
 133diff-tree --patch-with-raw initial
 134diff-tree --root --patch-with-raw initial
 135
 136diff-tree --pretty initial
 137diff-tree --pretty --root initial
 138diff-tree --pretty -p initial
 139diff-tree --pretty --stat initial
 140diff-tree --pretty --summary initial
 141diff-tree --pretty --stat --summary initial
 142diff-tree --pretty --root -p initial
 143diff-tree --pretty --root --stat initial
 144# improved by Timo's patch
 145diff-tree --pretty --root --summary initial
 146# improved by Timo's patch
 147diff-tree --pretty --root --summary -r initial
 148diff-tree --pretty --root --stat --summary initial
 149diff-tree --pretty --patch-with-stat initial
 150diff-tree --pretty --root --patch-with-stat initial
 151diff-tree --pretty --patch-with-raw initial
 152diff-tree --pretty --root --patch-with-raw initial
 153
 154diff-tree --pretty=oneline initial
 155diff-tree --pretty=oneline --root initial
 156diff-tree --pretty=oneline -p initial
 157diff-tree --pretty=oneline --root -p initial
 158diff-tree --pretty=oneline --patch-with-stat initial
 159# improved by Timo's patch
 160diff-tree --pretty=oneline --root --patch-with-stat initial
 161diff-tree --pretty=oneline --patch-with-raw initial
 162diff-tree --pretty=oneline --root --patch-with-raw initial
 163
 164diff-tree --pretty side
 165diff-tree --pretty -p side
 166diff-tree --pretty --patch-with-stat side
 167
 168diff-tree master
 169diff-tree -p master
 170diff-tree -p -m master
 171diff-tree -c master
 172diff-tree -c --abbrev master
 173diff-tree --cc master
 174# stat only should show the diffstat with the first parent
 175diff-tree -c --stat master
 176diff-tree --cc --stat master
 177diff-tree -c --stat --summary master
 178diff-tree --cc --stat --summary master
 179# stat summary should show the diffstat and summary with the first parent
 180diff-tree -c --stat --summary side
 181diff-tree --cc --stat --summary side
 182# improved by Timo's patch
 183diff-tree --cc --patch-with-stat master
 184# improved by Timo's patch
 185diff-tree --cc --patch-with-stat --summary master
 186# this is correct
 187diff-tree --cc --patch-with-stat --summary side
 188
 189log master
 190log -p master
 191log --root master
 192log --root -p master
 193log --patch-with-stat master
 194log --root --patch-with-stat master
 195log --root --patch-with-stat --summary master
 196# improved by Timo's patch
 197log --root -c --patch-with-stat --summary master
 198# improved by Timo's patch
 199log --root --cc --patch-with-stat --summary master
 200log -SF master
 201log -SF -p master
 202
 203whatchanged master
 204whatchanged -p master
 205whatchanged --root master
 206whatchanged --root -p master
 207whatchanged --patch-with-stat master
 208whatchanged --root --patch-with-stat master
 209whatchanged --root --patch-with-stat --summary master
 210# improved by Timo's patch
 211whatchanged --root -c --patch-with-stat --summary master
 212# improved by Timo's patch
 213whatchanged --root --cc --patch-with-stat --summary master
 214whatchanged -SF master
 215whatchanged -SF -p master
 216
 217log --patch-with-stat master -- dir/
 218whatchanged --patch-with-stat master -- dir/
 219log --patch-with-stat --summary master -- dir/
 220whatchanged --patch-with-stat --summary master -- dir/
 221
 222show initial
 223show --root initial
 224show side
 225show master
 226show --stat side
 227show --stat --summary side
 228show --patch-with-stat side
 229show --patch-with-raw side
 230show --patch-with-stat --summary side
 231
 232format-patch --stdout initial..side
 233format-patch --stdout initial..master^
 234format-patch --stdout initial..master
 235format-patch --attach --stdout initial..side
 236format-patch --attach --stdout initial..master^
 237format-patch --attach --stdout initial..master
 238
 239diff --abbrev initial..side
 240diff -r initial..side
 241diff --stat initial..side
 242diff -r --stat initial..side
 243diff initial..side
 244diff --patch-with-stat initial..side
 245diff --patch-with-raw initial..side
 246diff --patch-with-stat -r initial..side
 247diff --patch-with-raw -r initial..side
 248EOF
 249
 250test_done