diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-17 23:15:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-17 23:15:41 -0700 |
| commit | 80608a61f0f855deec369fbce59facf859050a34 (patch) | |
| tree | 532cba9acd7bdf63ff7f707f5d14cba82569b7d7 /t | |
| parent | Merge branch 'master' into next (diff) | |
| parent | combine-diff: show diffstat with the first parent. (diff) | |
| download | tgif-80608a61f0f855deec369fbce59facf859050a34.tar.xz | |
Merge branch 'lt/logopt' into next
* lt/logopt:
combine-diff: show diffstat with the first parent.
git.c: LOGSIZE is unused after log printing cleanup.
Log message printout cleanups (#3): fix --pretty=oneline
Log message printout cleanups (#2)
Log message printout cleanups
rev-list --header: output format fix
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1200-tutorial.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index 10024133e3..16b3ea9157 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -49,7 +49,7 @@ test_expect_success 'git diff HEAD' 'cmp diff.expect diff.output' #test_expect_success 'git-read-tree --reset HEAD' "git-read-tree --reset HEAD ; test \"hello: needs update\" = \"$(git-update-index --refresh)\"" cat > whatchanged.expect << EOF -diff-tree VARIABLE (from root) +commit VARIABLE Author: VARIABLE Date: VARIABLE @@ -72,7 +72,7 @@ index 0000000..557db03 EOF git-whatchanged -p --root | \ - sed -e "1s/^\(.\{10\}\).\{40\}/\1VARIABLE/" \ + sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \ -e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \ > whatchanged.output test_expect_success 'git-whatchanged -p --root' 'cmp whatchanged.expect whatchanged.output' |