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/t3507-cherry-pick-conflict.sh | |
| parent | 5abbeb4921c7dc389f4d1aa4c4d7d67680ada96c (diff) | |
| parent | 334ae397452170dacfcd8e69e4a41f6a64f54eec (diff) | |
| download | git-57ff1703d72db1cf33f985dcebfb03fdaab758dc.tar.gz | |
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/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 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 && |