Skip to content

Commit 583b61c

Browse files
committed
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
2 parents ad524f8 + d299e9e commit 583b61c

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

t/t4013-diff-various.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,4 +324,14 @@ test_expect_success 'diff --cached -- file on unborn branch' '
324324
test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
325325
'
326326

327+
test_expect_success 'diff-tree --stdin with log formatting' '
328+
cat >expect <<-\EOF &&
329+
Side
330+
Third
331+
Second
332+
EOF
333+
git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
334+
test_cmp expect actual
335+
'
336+
327337
test_done

0 commit comments

Comments
 (0)