mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
9c5b2fab30
Fix the argument order for test_cmp. When given the expected result first the diff shows the actual output with '+' and the expectation with '-', which is the convention for our tests. Signed-off-by: Stefan Beller <sbeller@google.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
42 lines
958 B
Bash
Executable file
42 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 expected actual
|
|
'
|
|
|
|
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 expected actual
|
|
'
|
|
|
|
test_done
|