Fossil SCM
Potential, minimally-tested fix for (remote add default URL) not working, as reported in [forum:5748fcb117a99b43|forum post 5748fcb117a99b43].
Commit
c06f58b56511eb7998830c7d15f2afc17603a9af4d89c91a3ae56e57420ef27c
Parent
44a7149dc78046d…
1 file changed
+5
-2
+5
-2
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -616,11 +616,14 @@ | ||
| 616 | 616 | UrlData x; |
| 617 | 617 | if( g.argc!=5 ) usage("add NAME URL"); |
| 618 | 618 | memset(&x, 0, sizeof(x)); |
| 619 | 619 | zName = g.argv[3]; |
| 620 | 620 | zUrl = g.argv[4]; |
| 621 | - if( strcmp(zName,"default")==0 ) goto remote_add_default; | |
| 621 | + if( strcmp(zName,"default")==0 ){ | |
| 622 | + zArg = zUrl; | |
| 623 | + goto remote_add_default; | |
| 624 | + } | |
| 622 | 625 | db_begin_write(); |
| 623 | 626 | if( fossil_strcmp(zUrl,"default")==0 ){ |
| 624 | 627 | x.canonical = db_get("last-sync-url",0); |
| 625 | 628 | x.passwd = unobscure(db_get("last-sync-pw",0)); |
| 626 | 629 | }else{ |
| @@ -700,11 +703,11 @@ | ||
| 700 | 703 | || db_exists("SELECT 1 FROM config WHERE name='sync-url:%q'",zArg) |
| 701 | 704 | ){ |
| 702 | 705 | remote_add_default: |
| 703 | 706 | db_unset("last-sync-url", 0); |
| 704 | 707 | db_unset("last-sync-pw", 0); |
| 705 | - url_parse(g.argv[2], URL_REMEMBER|URL_PROMPT_PW| | |
| 708 | + url_parse(zArg, URL_REMEMBER|URL_PROMPT_PW| | |
| 706 | 709 | URL_USE_CONFIG|URL_ASK_REMEMBER_PW); |
| 707 | 710 | url_remember(); |
| 708 | 711 | return; |
| 709 | 712 | } |
| 710 | 713 | fossil_fatal("unknown command \"%s\" - should be a URL or one of: " |
| 711 | 714 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -616,11 +616,14 @@ | |
| 616 | UrlData x; |
| 617 | if( g.argc!=5 ) usage("add NAME URL"); |
| 618 | memset(&x, 0, sizeof(x)); |
| 619 | zName = g.argv[3]; |
| 620 | zUrl = g.argv[4]; |
| 621 | if( strcmp(zName,"default")==0 ) goto remote_add_default; |
| 622 | db_begin_write(); |
| 623 | if( fossil_strcmp(zUrl,"default")==0 ){ |
| 624 | x.canonical = db_get("last-sync-url",0); |
| 625 | x.passwd = unobscure(db_get("last-sync-pw",0)); |
| 626 | }else{ |
| @@ -700,11 +703,11 @@ | |
| 700 | || db_exists("SELECT 1 FROM config WHERE name='sync-url:%q'",zArg) |
| 701 | ){ |
| 702 | remote_add_default: |
| 703 | db_unset("last-sync-url", 0); |
| 704 | db_unset("last-sync-pw", 0); |
| 705 | url_parse(g.argv[2], URL_REMEMBER|URL_PROMPT_PW| |
| 706 | URL_USE_CONFIG|URL_ASK_REMEMBER_PW); |
| 707 | url_remember(); |
| 708 | return; |
| 709 | } |
| 710 | fossil_fatal("unknown command \"%s\" - should be a URL or one of: " |
| 711 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -616,11 +616,14 @@ | |
| 616 | UrlData x; |
| 617 | if( g.argc!=5 ) usage("add NAME URL"); |
| 618 | memset(&x, 0, sizeof(x)); |
| 619 | zName = g.argv[3]; |
| 620 | zUrl = g.argv[4]; |
| 621 | if( strcmp(zName,"default")==0 ){ |
| 622 | zArg = zUrl; |
| 623 | goto remote_add_default; |
| 624 | } |
| 625 | db_begin_write(); |
| 626 | if( fossil_strcmp(zUrl,"default")==0 ){ |
| 627 | x.canonical = db_get("last-sync-url",0); |
| 628 | x.passwd = unobscure(db_get("last-sync-pw",0)); |
| 629 | }else{ |
| @@ -700,11 +703,11 @@ | |
| 703 | || db_exists("SELECT 1 FROM config WHERE name='sync-url:%q'",zArg) |
| 704 | ){ |
| 705 | remote_add_default: |
| 706 | db_unset("last-sync-url", 0); |
| 707 | db_unset("last-sync-pw", 0); |
| 708 | url_parse(zArg, URL_REMEMBER|URL_PROMPT_PW| |
| 709 | URL_USE_CONFIG|URL_ASK_REMEMBER_PW); |
| 710 | url_remember(); |
| 711 | return; |
| 712 | } |
| 713 | fossil_fatal("unknown command \"%s\" - should be a URL or one of: " |
| 714 |