diff options
| author | Martin von Zweigbergk <martinvonz@gmail.com> | 2012-12-21 19:10:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-23 03:06:35 (GMT) |
| commit | 5d77298d084f01a854c8aecc1709acf53d956ef8 (patch) | |
| tree | 4ead32901d2e113cd03fbf58a9685bc5beac7ec6 /t/t3507-cherry-pick-conflict.sh | |
| parent | b3cf6f3b8d21b32d88313fc709442b78300975db (diff) | |
| download | git-5d77298d084f01a854c8aecc1709acf53d956ef8.zip git-5d77298d084f01a854c8aecc1709acf53d956ef8.tar.gz git-5d77298d084f01a854c8aecc1709acf53d956ef8.tar.bz2 | |
tests: move test_cmp_rev to test-lib-functions
A function for checking that two given parameters refer to the same
revision was defined in several places, so move the definition to
test-lib-functions.sh instead.
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
| -rwxr-xr-x | t/t3507-cherry-pick-conflict.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index c82f721..223b984 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -11,12 +11,6 @@ test_description='test cherry-pick and revert with conflicts . ./test-lib.sh -test_cmp_rev () { - git rev-parse --verify "$1" >expect.rev && - git rev-parse --verify "$2" >actual.rev && - test_cmp expect.rev actual.rev -} - pristine_detach () { git checkout -f "$1^0" && git read-tree -u --reset HEAD && |