Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jul 2014 18:31:46 +0000 (11:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jul 2014 18:31:46 +0000 (11:31 -0700)
* 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

1  2 
t/t4013-diff-various.sh
diff --combined t/t4013-diff-various.sh
index 805b055c899e7c9f5653eb740572f67417c9dcb6,f7a9af893b453134140366a879ccb4d720ef7050..6ec607211803d2685b109b7fc0d926d206bbf1d4
@@@ -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