diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-02-15 11:39:29 -0800 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2013-02-15 11:39:29 -0800 |
| commit | ee5a57bc5c5641c30bc626892ddc31ddd18ed7ad (patch) | |
| tree | 5f1b1cf96ba7fd0f29317e4fa863a2c29db97532 /t/t4205-log-pretty-formats.sh | |
| parent | 264628a2b3a5cb6c7671ea87ceecab941ec290e9 (diff) | |
| download | git-ee5a57bc5c5641c30bc626892ddc31ddd18ed7ad.tar.gz git-ee5a57bc5c5641c30bc626892ddc31ddd18ed7ad.tar.bz2 git-ee5a57bc5c5641c30bc626892ddc31ddd18ed7ad.zip | |
Imported Upstream version 1.8.1.3upstream/1.8.1.3
Diffstat (limited to 't/t4205-log-pretty-formats.sh')
| -rwxr-xr-x | t/t4205-log-pretty-formats.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 2c45de7a..98a43d45 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -85,7 +85,7 @@ test_expect_success 'NUL termination' ' test_expect_success 'NUL separation with --stat' ' stat0_part=$(git diff --stat HEAD^ HEAD) && - stat1_part=$(git diff --stat --root HEAD^) && + stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) && printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n" >expected && git log -z --stat --pretty="format:%s" >actual && test_i18ncmp expected actual @@ -93,7 +93,7 @@ test_expect_success 'NUL separation with --stat' ' test_expect_failure 'NUL termination with --stat' ' stat0_part=$(git diff --stat HEAD^ HEAD) && - stat1_part=$(git diff --stat --root HEAD^) && + stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) && printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n\0" >expected && git log -z --stat --pretty="tformat:%s" >actual && test_i18ncmp expected actual |