diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-13 13:38:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-13 13:38:47 -0800 |
| commit | 5032098614b6f68258d1f5d13615b9dcbf25f040 (patch) | |
| tree | 803b22896733354973fda9ee0a4f357eb95f7e32 /t | |
| parent | c337684842e37d2422aa75b04ca1a3ee6d4a8ef0 (diff) | |
| parent | a74352867e689d50ee9c368f24d4a64392e27a35 (diff) | |
| download | git-5032098614b6f68258d1f5d13615b9dcbf25f040.tar.gz | |
Merge branch 'jc/revision-range-unpeel' into maint
"git log --left-right A...B" lost the "leftness" of commits
reachable from A when A is a tag as a side effect of a recent
bugfix. This is a regression in 1.8.4.x series.
* jc/revision-range-unpeel:
revision: propagate flag bits from tags to pointees
revision: mark contents of an uninteresting tree uninteresting
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6000-rev-list-misc.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index 15e3d6476c..3794e4ceaf 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -56,4 +56,21 @@ test_expect_success 'rev-list A..B and rev-list ^A B are the same' ' test_cmp expect actual ' +test_expect_success 'propagate uninteresting flag down correctly' ' + git rev-list --objects ^HEAD^{tree} HEAD^{tree} >actual && + >expect && + test_cmp expect actual +' + +test_expect_success 'symleft flag bit is propagated down from tag' ' + git log --format="%m %s" --left-right v1.0...master >actual && + cat >expect <<-\EOF && + > two + > one + < another + < that + EOF + test_cmp expect actual +' + test_done |