2008-08-29 19:18:38 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='--reverse combines with --parents'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
|
|
commit () {
|
|
|
|
test_tick &&
|
|
|
|
echo $1 > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git commit -m "$1"
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'set up --reverse example' '
|
|
|
|
commit one &&
|
|
|
|
git tag root &&
|
|
|
|
commit two &&
|
|
|
|
git checkout -b side HEAD^ &&
|
|
|
|
commit three &&
|
|
|
|
git checkout master &&
|
|
|
|
git merge -s ours side &&
|
|
|
|
commit five
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--reverse --parents --full-history combines correctly' '
|
|
|
|
git rev-list --parents --full-history master -- foo |
|
2012-06-12 16:49:59 +00:00
|
|
|
"$PERL_PATH" -e "print reverse <>" > expected &&
|
2008-08-29 19:18:38 +00:00
|
|
|
git rev-list --reverse --parents --full-history master -- foo \
|
|
|
|
> actual &&
|
|
|
|
test_cmp actual expected
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--boundary does too' '
|
|
|
|
git rev-list --boundary --parents --full-history master ^root -- foo |
|
2012-06-12 16:49:59 +00:00
|
|
|
"$PERL_PATH" -e "print reverse <>" > expected &&
|
2008-08-29 19:18:38 +00:00
|
|
|
git rev-list --boundary --reverse --parents --full-history \
|
|
|
|
master ^root -- foo > actual &&
|
|
|
|
test_cmp actual expected
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|