]> git.ipfire.org Git - thirdparty/git.git/commit - t/t4013/diff.log_--root_-p_master
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4499a42 c2ebaa2)
Merge branch 'jk/blame-coalesce-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2020 23:14:49 +0000 (16:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2020 23:14:49 +0000 (16:14 -0700)
commit93121dfd8c1aaed387fe4d5af7597cf0a675199b
treea8a202008e33735e6b5fa9cb878053b4c760ed66tree | snapshot
parent4499a42d0cb774c1ed6953d03226b7cbe0756af7commit | diff
parentc2ebaa27d63bfb7c50cbbdaba90aee4efdd45d0acommit | diff
Merge branch 'jk/blame-coalesce-fix'

When given more than one target line ranges, "git blame -La,b
-Lc,d" was over-eager to coalesce groups of original lines and
showed incorrect results, which has been corrected.

* jk/blame-coalesce-fix:
  blame: only coalesce lines that are adjacent in result
  t8003: factor setup out of coalesce test
  t8003: check output of coalesced blame
t/t8003-blame-corner-cases.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.