From 5d77298d084f01a854c8aecc1709acf53d956ef8 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Fri, 21 Dec 2012 11:10:10 -0800 Subject: 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 Signed-off-by: Junio C Hamano --- t/t3507-cherry-pick-conflict.sh | 6 ------ 1 file changed, 6 deletions(-) (limited to 't/t3507-cherry-pick-conflict.sh') diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index c82f7210c4..223b98433c 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 && -- cgit v1.2.1