http: extract type/subtype portion of content-type

diff --git a/t/t3503-cherry-pick-root.sh b/t/t3503-cherry-pick-root.sh
index b0faa299183df5fe06ccaf383bce47cbb9a0cf89..e27f39d1e5b0fb0ac3a1fc6417f0f3240934f07d 100755 (executable)
--- a/t/t3503-cherry-pick-root.sh
+++ b/t/t3503-cherry-pick-root.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='test cherry-picking a root commit'
+test_description='test cherry-picking (and reverting) a root commit'
 
 . ./test-lib.sh
 
@@ -16,14 +16,62 @@ test_expect_success setup '
        echo second > file2 &&
        git add file2 &&
        test_tick &&
-       git commit -m "second"
+       git commit -m "second" &&
+
+       git symbolic-ref HEAD refs/heads/third &&
+       rm .git/index file2 &&
+       echo third > file3 &&
+       git add file3 &&
+       test_tick &&
+       git commit -m "third"
 
 '
 
 test_expect_success 'cherry-pick a root commit' '
 
+       git checkout second^0 &&
        git cherry-pick master &&
-       test first = $(cat file1)
+       echo first >expect &&
+       test_cmp expect file1
+
+'
+
+test_expect_success 'revert a root commit' '
+
+       git revert master &&
+       test_path_is_missing file1
+
+'
+
+test_expect_success 'cherry-pick a root commit with an external strategy' '
+
+       git cherry-pick --strategy=resolve master &&
+       echo first >expect &&
+       test_cmp expect file1
+
+'
+
+test_expect_success 'revert a root commit with an external strategy' '
+
+       git revert --strategy=resolve master &&
+       test_path_is_missing file1
+
+'
+
+test_expect_success 'cherry-pick two root commits' '
+
+       echo first >expect.file1 &&
+       echo second >expect.file2 &&
+       echo third >expect.file3 &&
+
+       git checkout second^0 &&
+       git cherry-pick master third &&
+
+       test_cmp expect.file1 file1 &&
+       test_cmp expect.file2 file2 &&
+       test_cmp expect.file3 file3 &&
+       git rev-parse --verify HEAD^^ &&
+       test_must_fail git rev-parse --verify HEAD^^^
 
 '