From 60e3aba9c3c99c40826c051d384e785935874962 Mon Sep 17 00:00:00 2001 From: Daniel Barkalow Date: Sat, 12 Apr 2008 15:32:00 -0400 Subject: [PATCH] Fix config key miscount in url.*.insteadOf Also tighten test to require it to be correct. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano --- remote.c | 2 +- t/t5516-fetch-push.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/remote.c b/remote.c index 08af7f9de1..369dc3398c 100644 --- 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; - name = key + 5; + name = key + 4; subkey = strrchr(name, '.'); if (!subkey) return 0; diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 793ffc6600..6d7e738548 100755 --- 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 && ( - TRASH=$(pwd) && + TRASH=$(pwd)/ && 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 && @@ -145,8 +145,8 @@ test_expect_success 'push with wildcard' ' 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 && -- 2.11.4.GIT