| #!/bin/sh |
| # |
| # Copyright (c) 2006 Junio C Hamano |
| # |
| |
| test_description='Various diff formatting options' |
| |
| . ./test-lib.sh |
| |
| LF=' |
| ' |
| |
| test_expect_success setup ' |
| |
| GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" && |
| GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" && |
| export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && |
| |
| mkdir dir && |
| for i in 1 2 3; do echo $i; done >file0 && |
| for i in A B; do echo $i; done >dir/sub && |
| cat file0 >file2 && |
| git add file0 file2 dir/sub && |
| git commit -m Initial && |
| |
| git branch initial && |
| git branch side && |
| |
| GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" && |
| GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" && |
| export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && |
| |
| for i in 4 5 6; do echo $i; done >>file0 && |
| for i in C D; do echo $i; done >>dir/sub && |
| rm -f file2 && |
| git update-index --remove file0 file2 dir/sub && |
| git commit -m "Second${LF}${LF}This is the second commit." && |
| |
| GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" && |
| GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" && |
| export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && |
| |
| for i in A B C; do echo $i; done >file1 && |
| git add file1 && |
| for i in E F; do echo $i; done >>dir/sub && |
| git update-index dir/sub && |
| git commit -m Third && |
| |
| GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" && |
| GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" && |
| export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && |
| |
| git checkout side && |
| for i in A B C; do echo $i; done >>file0 && |
| for i in 1 2; do echo $i; done >>dir/sub && |
| cat dir/sub >file3 && |
| git add file3 && |
| git update-index file0 dir/sub && |
| git commit -m Side && |
| |
| GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" && |
| GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" && |
| export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && |
| |
| git checkout master && |
| git pull -s ours . side && |
| |
| GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" && |
| GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" && |
| export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && |
| |
| for i in A B C; do echo $i; done >>file0 && |
| for i in 1 2; do echo $i; done >>dir/sub && |
| git update-index file0 dir/sub && |
| |
| git commit --amend && |
| git show-branch |
| ' |
| |
| : <<\EOF |
| ! [initial] Initial |
| * [master] Merge branch 'side' |
| ! [side] Side |
| --- |
| - [master] Merge branch 'side' |
| *+ [side] Side |
| * [master^] Second |
| +*+ [initial] Initial |
| EOF |
| |
| V=`git version | sed -e 's/^git version //'` |
| while read cmd |
| do |
| case "$cmd" in |
| '' | '#'*) continue ;; |
| esac |
| test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'` |
| cnt=`expr $test_count + 1` |
| pfx=`printf "%04d" $cnt` |
| expect="../t4013/diff.$test" |
| actual="$pfx-diff.$test" |
| |
| test_expect_success "git $cmd" ' |
| { |
| echo "\$ git $cmd" |
| git $cmd | sed -e "s/$V/g-i-t--v-e-r-s-i-o-n/" |
| echo "\$" |
| } >"$actual" && |
| if test -f "$expect" |
| then |
| diff -u "$expect" "$actual" && |
| rm -f "$actual" |
| else |
| # this is to help developing new tests. |
| cp "$actual" "$expect" |
| false |
| fi |
| ' |
| done <<\EOF |
| diff-tree initial |
| diff-tree -r initial |
| diff-tree -r --abbrev initial |
| diff-tree -r --abbrev=4 initial |
| diff-tree --root initial |
| diff-tree --root --abbrev initial |
| diff-tree --root -r initial |
| diff-tree --root -r --abbrev initial |
| diff-tree --root -r --abbrev=4 initial |
| diff-tree -p initial |
| diff-tree --root -p initial |
| diff-tree --patch-with-stat initial |
| diff-tree --root --patch-with-stat initial |
| diff-tree --patch-with-raw initial |
| diff-tree --root --patch-with-raw initial |
| |
| diff-tree --pretty initial |
| diff-tree --pretty --root initial |
| diff-tree --pretty -p initial |
| diff-tree --pretty --stat initial |
| diff-tree --pretty --summary initial |
| diff-tree --pretty --stat --summary initial |
| diff-tree --pretty --root -p initial |
| diff-tree --pretty --root --stat initial |
| # improved by Timo's patch |
| diff-tree --pretty --root --summary initial |
| # improved by Timo's patch |
| diff-tree --pretty --root --summary -r initial |
| diff-tree --pretty --root --stat --summary initial |
| diff-tree --pretty --patch-with-stat initial |
| diff-tree --pretty --root --patch-with-stat initial |
| diff-tree --pretty --patch-with-raw initial |
| diff-tree --pretty --root --patch-with-raw initial |
| |
| diff-tree --pretty=oneline initial |
| diff-tree --pretty=oneline --root initial |
| diff-tree --pretty=oneline -p initial |
| diff-tree --pretty=oneline --root -p initial |
| diff-tree --pretty=oneline --patch-with-stat initial |
| # improved by Timo's patch |
| diff-tree --pretty=oneline --root --patch-with-stat initial |
| diff-tree --pretty=oneline --patch-with-raw initial |
| diff-tree --pretty=oneline --root --patch-with-raw initial |
| |
| diff-tree --pretty side |
| diff-tree --pretty -p side |
| diff-tree --pretty --patch-with-stat side |
| |
| diff-tree master |
| diff-tree -p master |
| diff-tree -p -m master |
| diff-tree -c master |
| diff-tree -c --abbrev master |
| diff-tree --cc master |
| # stat only should show the diffstat with the first parent |
| diff-tree -c --stat master |
| diff-tree --cc --stat master |
| diff-tree -c --stat --summary master |
| diff-tree --cc --stat --summary master |
| # stat summary should show the diffstat and summary with the first parent |
| diff-tree -c --stat --summary side |
| diff-tree --cc --stat --summary side |
| # improved by Timo's patch |
| diff-tree --cc --patch-with-stat master |
| # improved by Timo's patch |
| diff-tree --cc --patch-with-stat --summary master |
| # this is correct |
| diff-tree --cc --patch-with-stat --summary side |
| |
| log master |
| log -p master |
| log --root master |
| log --root -p master |
| log --patch-with-stat master |
| log --root --patch-with-stat master |
| log --root --patch-with-stat --summary master |
| # improved by Timo's patch |
| log --root -c --patch-with-stat --summary master |
| # improved by Timo's patch |
| log --root --cc --patch-with-stat --summary master |
| log -SF master |
| log -SF -p master |
| |
| whatchanged master |
| whatchanged -p master |
| whatchanged --root master |
| whatchanged --root -p master |
| whatchanged --patch-with-stat master |
| whatchanged --root --patch-with-stat master |
| whatchanged --root --patch-with-stat --summary master |
| # improved by Timo's patch |
| whatchanged --root -c --patch-with-stat --summary master |
| # improved by Timo's patch |
| whatchanged --root --cc --patch-with-stat --summary master |
| whatchanged -SF master |
| whatchanged -SF -p master |
| |
| log --patch-with-stat master -- dir/ |
| whatchanged --patch-with-stat master -- dir/ |
| log --patch-with-stat --summary master -- dir/ |
| whatchanged --patch-with-stat --summary master -- dir/ |
| |
| show initial |
| show --root initial |
| show side |
| show master |
| show --stat side |
| show --stat --summary side |
| show --patch-with-stat side |
| show --patch-with-raw side |
| show --patch-with-stat --summary side |
| |
| format-patch --stdout initial..side |
| format-patch --stdout initial..master^ |
| format-patch --stdout initial..master |
| format-patch --attach --stdout initial..side |
| format-patch --attach --stdout initial..master^ |
| format-patch --attach --stdout initial..master |
| |
| diff --abbrev initial..side |
| diff -r initial..side |
| diff --stat initial..side |
| diff -r --stat initial..side |
| diff initial..side |
| diff --patch-with-stat initial..side |
| diff --patch-with-raw initial..side |
| diff --patch-with-stat -r initial..side |
| diff --patch-with-raw -r initial..side |
| EOF |
| |
| test_done |