diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2008-04-12 23:32:00 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-13 02:41:24 +0400 |
| commit | 60e3aba9c3c99c40826c051d384e785935874962 (patch) | |
| tree | 57e050ce7ae84244c09936e34c12e71f8c758942 | |
| parent | d6d96f835cace1c108100cf88e216a59debcb937 (diff) | |
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>
| -rw-r--r-- | remote.c | 2 | ||||
| -rwxr-xr-x | t/t5516-fetch-push.sh | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -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 && |