diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:56:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:56:11 -0700 |
| commit | 911439a5aba362add6b672a09afd11706e05aed7 (patch) | |
| tree | b144f55826bf40fcbc4b6abc67995d582d2689ea /t | |
| parent | aaec1ad08a3a9aa64eb803ac5763dc8820f86498 (diff) | |
| parent | a765499a0884375c47c78d0d1e2926e875074427 (diff) | |
| download | git-911439a5aba362add6b672a09afd11706e05aed7.tar.gz git-911439a5aba362add6b672a09afd11706e05aed7.tar.xz | |
Merge branch 'kb/ancestry-path-threedots'
"git log --ancestry-path A...B" did not work as expected, as it did
not pay attention to the fact that the merge base between A and B
was the bottom of the range being specified.
* kb/ancestry-path-threedots:
revision.c: treat A...B merge bases as if manually specified
t6019: demonstrate --ancestry-path A...B breakage
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6019-rev-list-ancestry-path.sh | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh index 39b4cb0ec..dd5b0e55d 100755 --- a/t/t6019-rev-list-ancestry-path.sh +++ b/t/t6019-rev-list-ancestry-path.sh @@ -13,6 +13,9 @@ test_description='--ancestry-path' # # D..M -- M.t == M # --ancestry-path D..M -- M.t == M +# +# F...I == F G H I +# --ancestry-path F...I == F H I . ./test-lib.sh @@ -63,13 +66,29 @@ test_expect_success 'rev-list D..M -- M.t' ' test_cmp expect actual ' -test_expect_success 'rev-list --ancestry-patch D..M -- M.t' ' +test_expect_success 'rev-list --ancestry-path D..M -- M.t' ' echo M >expect && git rev-list --ancestry-path --format=%s D..M -- M.t | sed -e "/^commit /d" >actual && test_cmp expect actual ' +test_expect_success 'rev-list F...I' ' + for c in F G H I; do echo $c; done >expect && + git rev-list --format=%s F...I | + sed -e "/^commit /d" | + sort >actual && + test_cmp expect actual +' + +test_expect_success 'rev-list --ancestry-path F...I' ' + for c in F H I; do echo $c; done >expect && + git rev-list --ancestry-path --format=%s F...I | + sed -e "/^commit /d" | + sort >actual && + test_cmp expect actual +' + # b---bc # / \ / # a X |