Fossil SCM
Potential resolution of conflict with [64aa75260f] which causes the default-user setting to be ignored. Attempt to set default user from config if defined.
Commit
9f2a03bbb81cc50b9244d64a23f044ec72bf12fd
Parent
cd5f3be51ed713d…
1 file changed
+1
+1
| --- src/clone.c | ||
| +++ src/clone.c | ||
| @@ -136,10 +136,11 @@ | ||
| 136 | 136 | if( file_size(g.argv[3])>0 ){ |
| 137 | 137 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | url_parse(g.argv[2], urlFlags); |
| 141 | + if( zDefaultUser==0 ) zDefaultUser = db_get("default-user", 0); | |
| 141 | 142 | if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user; |
| 142 | 143 | if( g.url.isFile ){ |
| 143 | 144 | file_copy(g.url.name, g.argv[3]); |
| 144 | 145 | db_close(1); |
| 145 | 146 | db_open_repository(g.argv[3]); |
| 146 | 147 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -136,10 +136,11 @@ | |
| 136 | if( file_size(g.argv[3])>0 ){ |
| 137 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 138 | } |
| 139 | |
| 140 | url_parse(g.argv[2], urlFlags); |
| 141 | if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user; |
| 142 | if( g.url.isFile ){ |
| 143 | file_copy(g.url.name, g.argv[3]); |
| 144 | db_close(1); |
| 145 | db_open_repository(g.argv[3]); |
| 146 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -136,10 +136,11 @@ | |
| 136 | if( file_size(g.argv[3])>0 ){ |
| 137 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 138 | } |
| 139 | |
| 140 | url_parse(g.argv[2], urlFlags); |
| 141 | if( zDefaultUser==0 ) zDefaultUser = db_get("default-user", 0); |
| 142 | if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user; |
| 143 | if( g.url.isFile ){ |
| 144 | file_copy(g.url.name, g.argv[3]); |
| 145 | db_close(1); |
| 146 | db_open_repository(g.argv[3]); |
| 147 |