Fix config key miscount in url.*.insteadOf

Also tighten test to require it to be correct.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote.c b/remote.c
index 08af7f9de124f2e06dc8edd030212ecde9c22920..369dc3398cc22206497f17cd846702783f59cf76 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -315,7 +315,7 @@ static int handle_config(const char *key, const char *value)
        }
        if (!prefixcmp(key, "url.")) {
                struct rewrite *rewrite;
        }
        if (!prefixcmp(key, "url.")) {
                struct rewrite *rewrite;

-               name = key + 5;
+               name = key + 4;

                subkey = strrchr(name, '.');
                if (!subkey)
                        return 0;
                subkey = strrchr(name, '.');
                if (!subkey)
                        return 0;

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 793ffc6600202431193887a12981105c099d40df..6d7e7385483bda6223d8d222980bf33b2679f711 100755 (executable)
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -103,9 +103,9 @@ test_expect_success 'fetch with wildcard' '
 test_expect_success 'fetch with insteadOf' '
        mk_empty &&
        (
 test_expect_success 'fetch with insteadOf' '
        mk_empty &&
        (

-               TRASH=$(pwd) &&
+               TRASH=$(pwd)/ &&

                cd testrepo &&
                cd testrepo &&

-               git config url./$TRASH/.insteadOf trash/
+               git config url.$TRASH.insteadOf trash/

                git config remote.up.url trash/. &&
                git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
                git fetch up &&
                git config remote.up.url trash/. &&
                git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
                git fetch up &&


@@ -145,8 +145,8 @@ test_expect_success 'push with wildcard' '
 
 test_expect_success 'push with insteadOf' '
        mk_empty &&
 
 test_expect_success 'push with insteadOf' '
        mk_empty &&

-       TRASH=$(pwd) &&
-       git config url./$TRASH/.insteadOf trash/ &&
+       TRASH=$(pwd)/ &&
+       git config url.$TRASH.insteadOf trash/ &&

        git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
        (
                cd testrepo &&
        git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
        (
                cd testrepo &&