| test_description='--ancestry-path' |
| # A-------K---------------L--M |
| # D..M == E F G H I J K L M |
| # --ancestry-path D..M == E F H I J L M |
| # --ancestry-path D..M -- M.t == M |
| git merge -s ours -m "$2" "$1" && |
| test_expect_success setup ' |
| test_expect_success 'rev-list D..M' ' |
| for c in E F G H I J K L M; do echo $c; done >expect && |
| git rev-list --format=%s D..M | |
| test_expect_success 'rev-list --ancestry-path D..M' ' |
| for c in E F H I J L M; do echo $c; done >expect && |
| git rev-list --ancestry-path --format=%s D..M | |
| test_expect_success 'rev-list D..M -- M.t' ' |
| git rev-list --format=%s D..M -- M.t | |
| sed -e "/^commit /d" >actual && |
| test_expect_success 'rev-list --ancestry-patch D..M -- M.t' ' |
| git rev-list --ancestry-path --format=%s D..M -- M.t | |
| sed -e "/^commit /d" >actual && |