diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-16 21:32:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-16 21:32:34 (GMT) |
| commit | 14d5a3e47e38b29bf8aa7d6081d43ce0f24c3444 (patch) | |
| tree | 2d7e39ada8a1bbed93bcc115d733252222907fe4 /t | |
| parent | be4d6f4c7f94541fac1a06e4c04acc2d60de1f8c (diff) | |
| parent | 95a4fb0eac20de024fed242a7c9227af86334202 (diff) | |
| download | git-14d5a3e47e38b29bf8aa7d6081d43ce0f24c3444.zip git-14d5a3e47e38b29bf8aa7d6081d43ce0f24c3444.tar.gz git-14d5a3e47e38b29bf8aa7d6081d43ce0f24c3444.tar.bz2 | |
Merge branch 'jk/blame-first-parent' into maint
"git blame --first-parent v1.0..v2.0" was not rejected but did not
limit the blame to commits on the first parent chain.
* jk/blame-first-parent:
blame: handle --first-parent
Diffstat (limited to 't')
| -rw-r--r-- | t/annotate-tests.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index f5c0175..b1673b3 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -111,6 +111,10 @@ test_expect_success 'blame 2 authors + 2 merged-in authors' ' check_count A 2 B 1 B1 2 B2 1 ' +test_expect_success 'blame --first-parent blames merge for branch1' ' + check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1 +' + test_expect_success 'blame ancestor' ' check_count -h master A 2 B 2 ' |