diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-07 15:16:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 15:16:04 -0800 |
| commit | 57ff1703d72db1cf33f985dcebfb03fdaab758dc (patch) | |
| tree | f56f8404a9e768e3de582a662ee66325faf73c07 /t/t6030-bisect-porcelain.sh | |
| parent | Merge branch 'nd/fix-perf-parameters-in-tests' into maint (diff) | |
| parent | learn to pick/revert into unborn branch (diff) | |
| download | tgif-57ff1703d72db1cf33f985dcebfb03fdaab758dc.tar.xz | |
Merge branch 'mz/pick-unborn' into maint
"git cherry-pick" did not replay a root commit to an unborn branch.
* mz/pick-unborn:
learn to pick/revert into unborn branch
tests: move test_cmp_rev to test-lib-functions
Diffstat (limited to 't/t6030-bisect-porcelain.sh')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 72e28ee535..3e0e15fb3e 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -676,9 +676,7 @@ test_expect_success 'bisect fails if tree is broken on trial commit' ' check_same() { echo "Checking $1 is the same as $2" && - git rev-parse "$1" > expected.same && - git rev-parse "$2" > expected.actual && - test_cmp expected.same expected.actual + test_cmp_rev "$1" "$2" } test_expect_success 'bisect: --no-checkout - start commit bad' ' |