94221d2203
As of the last commit, we can use "perl" instead of "$PERL_PATH" when running tests, as the former is now a function which uses the latter. As the shorter "perl" is easier on the eyes, let's switch to using it everywhere. This is not quite a mechanical s/$PERL_PATH/perl/ replacement, though. There are some places where we invoke perl from a script we generate on the fly, and those scripts do not have access to our internal shell functions. The result can be double-checked by running: ln -s /bin/false bin-wrappers/perl make test which continues to pass even after this patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
43 lines
958 B
Bash
Executable File
43 lines
958 B
Bash
Executable File
#!/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 |
|
|
perl -e "print reverse <>" > expected &&
|
|
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 |
|
|
perl -e "print reverse <>" > expected &&
|
|
git rev-list --boundary --reverse --parents --full-history \
|
|
master ^root -- foo > actual &&
|
|
test_cmp actual expected
|
|
'
|
|
|
|
test_done
|