From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Jul 2014 18:31:46 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v2.1.0-rc1~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/583b61c1af1bac12d6b48b2583ad508b5ab9964c?ds=inline;hp=-c

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
---

583b61c1af1bac12d6b48b2583ad508b5ab9964c
diff --combined t/t4013-diff-various.sh
index 805b055c89,f7a9af893b..6ec6072118
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@@ -107,14 -107,14 +107,14 @@@ test_expect_success setup 
  +*++ [initial] Initial
  EOF
  
 -V=`git version | sed -e 's/^git version //' -e 's/\./\\./g'`
 +V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
  while read cmd
  do
  	case "$cmd" in
  	'' | '#'*) continue ;;
  	esac
 -	test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
 -	pfx=`printf "%04d" $test_count`
 +	test=$(echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g')
 +	pfx=$(printf "%04d" $test_count)
  	expect="$TEST_DIRECTORY/t4013/diff.$test"
  	actual="$pfx-diff.$test"
  
@@@ -324,4 -324,14 +324,14 @@@ test_expect_success 'diff --cached -- f
  	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