diff options
| author | Max Kirillov <max@max630.net> | 2015-10-30 08:01:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-31 01:33:13 +0300 |
| commit | 700fd28e4f3ecd6e7b5f8f2098e62ffef9ab958b (patch) | |
| tree | 7db023304999e3a7534ca3d93722c726b504e422 /t/t8009-blame-vs-topicbranches.sh | |
| parent | 1b0d40000a511a8db81a20a6dab00984bdbc0d63 (diff) | |
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 <max@max630.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t8009-blame-vs-topicbranches.sh')
| -rwxr-xr-x | t/t8009-blame-vs-topicbranches.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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_full | sed -e "s/ .*//" >actual && git rev-parse A1 >expect && |