From 700fd28e4f3ecd6e7b5f8f2098e62ffef9ab958b Mon Sep 17 00:00:00 2001 From: Max Kirillov Date: Fri, 30 Oct 2015 07:01:53 +0200 Subject: blame: allow blame --reverse --first-parent when it makes sense Allow combining --reverse and --first-parent if initial commit of specified range is at the first-parent chain starting from the final commit. Disable the prepare_revision_walk()'s builtin children collection, instead picking only the ones which are along the first parent chain. Signed-off-by: Max Kirillov Signed-off-by: Junio C Hamano --- t/t8009-blame-vs-topicbranches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') diff --git a/t/t8009-blame-vs-topicbranches.sh b/t/t8009-blame-vs-topicbranches.sh index 175ad376bd..72596e38b2 100755 --- a/t/t8009-blame-vs-topicbranches.sh +++ b/t/t8009-blame-vs-topicbranches.sh @@ -26,7 +26,7 @@ test_expect_success setup ' test_merge A3 C1 ' -test_expect_failure 'blame --reverse --first-parent finds A1' ' +test_expect_success 'blame --reverse --first-parent finds A1' ' git blame --porcelain --reverse --first-parent A0..A3 -- file.t >actual_full && head -n 1 actual && git rev-parse A1 >expect && -- cgit v1.3-5-g9baa