On Mon, Jul 28, 2014 at 01:37:34PM -0400, Jeff King wrote: > On Mon, Jul 28, 2014 at 10:32:45AM -0700, Junio C Hamano wrote: > > > > Junio, we should consider a v2.0.4 with that series, I think. This is a > > > pretty serious regression in diff-tree (I didn't even realize that the > > > buffer-slab work went into the maint series; that may have been a little > > > ambitious). > > > > Or v2.0.4 without that series, which is how we usually do things, > > but let me see if jk/alloc-commit-id is easily applicable there > > first. > > Yeah, I'm fine with a straight revert, too (I think it is fine to keep > in master, though). I think jk/alloc-commit-id is built right on top of > the original commit-slab topic, so it should be easy to do either way. > > Thanks for dealing with it. Whatever we do, perhaps it is worth applying the test below on top? -- >8 -- Subject: t4013: test diff-tree's --stdin commit formatting Once upon a time, git-log was just "rev-list | diff-tree", and we did not bother to test it separately. These days git-log is implemented internally, but we want to make sure that the rev-list to diff-tree pipeline continues to function. Let's add a basic sanity test. Signed-off-by: Jeff King <peff@xxxxxxxx> --- t/t4013-diff-various.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 805b055..6ec6072 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 -- 2.0.0.566.gfe3e6b2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html