Fossil SCM
Prevent the argument that follows -A from being interpreted as a repository and avoid incorrect file already exists errors.
Commit
cc421c006ab049b1fd69c1aa7fe644335fad9d5b
Parent
4e463bf7bac9958…
1 file changed
+1
-2
+1
-2
| --- src/clone.c | ||
| +++ src/clone.c | ||
| @@ -121,10 +121,11 @@ | ||
| 121 | 121 | int bPrivate = 0; /* Also clone private branches */ |
| 122 | 122 | int urlFlags = URL_PROMPT_PW | URL_REMEMBER; |
| 123 | 123 | |
| 124 | 124 | if( find_option("private",0,0)!=0 ) bPrivate = SYNC_PRIVATE; |
| 125 | 125 | if( find_option("once",0,0)!=0) urlFlags &= ~URL_REMEMBER; |
| 126 | + zDefaultUser = find_option("admin-user","A",1); | |
| 126 | 127 | clone_ssh_find_options(); |
| 127 | 128 | url_proxy_options(); |
| 128 | 129 | if( g.argc < 4 ){ |
| 129 | 130 | usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY"); |
| 130 | 131 | } |
| @@ -131,12 +132,10 @@ | ||
| 131 | 132 | db_open_config(0); |
| 132 | 133 | if( file_size(g.argv[3])>0 ){ |
| 133 | 134 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 134 | 135 | } |
| 135 | 136 | |
| 136 | - zDefaultUser = find_option("admin-user","A",1); | |
| 137 | - | |
| 138 | 137 | url_parse(g.argv[2], urlFlags); |
| 139 | 138 | if( zDefaultUser==0 && g.urlUser!=0 ) zDefaultUser = g.urlUser; |
| 140 | 139 | if( g.urlIsFile ){ |
| 141 | 140 | file_copy(g.urlName, g.argv[3]); |
| 142 | 141 | db_close(1); |
| 143 | 142 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -121,10 +121,11 @@ | |
| 121 | int bPrivate = 0; /* Also clone private branches */ |
| 122 | int urlFlags = URL_PROMPT_PW | URL_REMEMBER; |
| 123 | |
| 124 | if( find_option("private",0,0)!=0 ) bPrivate = SYNC_PRIVATE; |
| 125 | if( find_option("once",0,0)!=0) urlFlags &= ~URL_REMEMBER; |
| 126 | clone_ssh_find_options(); |
| 127 | url_proxy_options(); |
| 128 | if( g.argc < 4 ){ |
| 129 | usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY"); |
| 130 | } |
| @@ -131,12 +132,10 @@ | |
| 131 | db_open_config(0); |
| 132 | if( file_size(g.argv[3])>0 ){ |
| 133 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 134 | } |
| 135 | |
| 136 | zDefaultUser = find_option("admin-user","A",1); |
| 137 | |
| 138 | url_parse(g.argv[2], urlFlags); |
| 139 | if( zDefaultUser==0 && g.urlUser!=0 ) zDefaultUser = g.urlUser; |
| 140 | if( g.urlIsFile ){ |
| 141 | file_copy(g.urlName, g.argv[3]); |
| 142 | db_close(1); |
| 143 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -121,10 +121,11 @@ | |
| 121 | int bPrivate = 0; /* Also clone private branches */ |
| 122 | int urlFlags = URL_PROMPT_PW | URL_REMEMBER; |
| 123 | |
| 124 | if( find_option("private",0,0)!=0 ) bPrivate = SYNC_PRIVATE; |
| 125 | if( find_option("once",0,0)!=0) urlFlags &= ~URL_REMEMBER; |
| 126 | zDefaultUser = find_option("admin-user","A",1); |
| 127 | clone_ssh_find_options(); |
| 128 | url_proxy_options(); |
| 129 | if( g.argc < 4 ){ |
| 130 | usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY"); |
| 131 | } |
| @@ -131,12 +132,10 @@ | |
| 132 | db_open_config(0); |
| 133 | if( file_size(g.argv[3])>0 ){ |
| 134 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 135 | } |
| 136 | |
| 137 | url_parse(g.argv[2], urlFlags); |
| 138 | if( zDefaultUser==0 && g.urlUser!=0 ) zDefaultUser = g.urlUser; |
| 139 | if( g.urlIsFile ){ |
| 140 | file_copy(g.urlName, g.argv[3]); |
| 141 | db_close(1); |
| 142 |