strbuf: add strbuf_add*_urlencode

diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index e97397f96b29d9f20183c99999ec5bf7923549e7..2c4c1c851dcbb1cd38edc2a2620e2b04e36f7192 100755 (executable)
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -95,7 +95,7 @@ test_expect_success '--quit cleans up sequencer state' '
        test_path_is_missing .git/sequencer
 '
 
-test_expect_success 'cherry-pick --reset (another name for --quit)' '
+test_expect_success '--quit keeps HEAD and conflicted index intact' '
        pristine_detach initial &&
        cat >expect <<-\EOF &&
        OBJID
@@ -105,7 +105,7 @@ test_expect_success 'cherry-pick --reset (another name for --quit)' '
        :000000 100644 OBJID OBJID A    unrelated
        EOF
        test_must_fail git cherry-pick base..picked &&
-       git cherry-pick --reset &&
+       git cherry-pick --quit &&
        test_path_is_missing .git/sequencer &&
        test_must_fail git update-index --refresh &&
        {