diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-28 11:31:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-28 11:31:46 -0700 |
| commit | 583b61c1af1bac12d6b48b2583ad508b5ab9964c (patch) | |
| tree | 0c5ca59da75fdc0050c277b5cb544a8fe64b91b9 | |
| parent | ad524f834a9acaaaceeb846d00ea609f79333a3d (diff) | |
| parent | d299e9e550c1bf8640907fdba1f03cc585ee71df (diff) | |
| download | git-583b61c1af1bac12d6b48b2583ad508b5ab9964c.tar.gz | |
Merge branch 'maint'
* maint:
t4013: test diff-tree's --stdin commit formatting
diff-tree: avoid lookup_unknown_object
object_as_type: set commit index
alloc: factor out commit index
add object_as_type helper for casting objects
parse_object_buffer: do not set object type
move setting of object->type to alloc_* functions
alloc: write out allocator definitions
alloc.c: remove the alloc_raw_commit_node() function
| -rwxr-xr-x | t/t4013-diff-various.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 805b055c89..6ec6072118 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -324,4 +324,14 @@ test_expect_success 'diff --cached -- file on unborn branch' ' test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result ' +test_expect_success 'diff-tree --stdin with log formatting' ' + cat >expect <<-\EOF && + Side + Third + Second + EOF + git rev-list master | git diff-tree --stdin --format=%s -s >actual && + test_cmp expect actual +' + test_done |