Merge branch 'sb/merge-recursive-copy-paste-fix'

diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
index 15e3d6476c78ba3447504aa133e9e1d7ffbfd87d..3794e4ceafc291be5621411f3cad7bf5ef764942 100755 (executable)
--- 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