diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-18 13:56:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-18 13:56:36 -0700 |
| commit | 34e98ea56414adc5a582e6368e8ec9c109dbee48 (patch) | |
| tree | 7081c2475ea0c9df65dcc9933c32a51ae174c352 /t | |
| parent | 4baff50551545e2b6825973ec37bcaf03edb95fe (diff) | |
| parent | 3a624b346db02a07b0317743b362d1a15c6c3c18 (diff) | |
| download | git-34e98ea56414adc5a582e6368e8ec9c109dbee48.tar.gz git-34e98ea56414adc5a582e6368e8ec9c109dbee48.tar.xz | |
Merge branch 'lt/logopt'
* lt/logopt:
Fix "git log --stat": make sure to set recursive with --stat.
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
Fixes for option parsing
log/whatchanged/show - log formatting cleanup.
Simplify common default options setup for built-in log family.
Tentative built-in "git show"
Built-in git-whatchanged.
rev-list option parser fix.
Split init_revisions() out of setup_revisions()
Fix up rev-list option parsing.
Fix up default abbrev in setup_revisions() argument parser.
Common option parsing for "git log --diff" and friends
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 10024133e..16b3ea915 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' |