Fossil SCM
Make -f an alias for --force on "fossil open".
Commit
17c244de219d29621eb67ee24ad92769be74b556c5e0eda7c40f4d671d57c4ee
Parent
a703b4ce25c29cd…
1 file changed
+3
-3
M
src/db.c
+3
-3
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -3111,11 +3111,11 @@ | ||
| 3111 | 3111 | ** |
| 3112 | 3112 | ** Options: |
| 3113 | 3113 | ** --empty Initialize checkout as being empty, but still connected |
| 3114 | 3114 | ** with the local repository. If you commit this checkout, |
| 3115 | 3115 | ** it will become a new "initial" commit in the repository. |
| 3116 | -** --force Continue with the open even if the working directory is | |
| 3116 | +** -f|--force Continue with the open even if the working directory is | |
| 3117 | 3117 | ** not empty. |
| 3118 | 3118 | ** --force-missing Force opening a repository with missing content |
| 3119 | 3119 | ** --keep Only modify the manifest and manifest.uuid files |
| 3120 | 3120 | ** --nested Allow opening a repository inside an opened checkout |
| 3121 | 3121 | ** --repodir DIR If REPOSITORY is a URI that will be cloned, store |
| @@ -3149,11 +3149,11 @@ | ||
| 3149 | 3149 | forceMissingFlag = find_option("force-missing",0,0)!=0; |
| 3150 | 3150 | allowNested = find_option("nested",0,0)!=0; |
| 3151 | 3151 | setmtimeFlag = find_option("setmtime",0,0)!=0; |
| 3152 | 3152 | zWorkDir = find_option("workdir",0,1); |
| 3153 | 3153 | zRepoDir = find_option("repodir",0,1); |
| 3154 | - bForce = find_option("force",0,0)!=0; | |
| 3154 | + bForce = find_option("force","f",0)!=0; | |
| 3155 | 3155 | zPwd = file_getcwd(0,0); |
| 3156 | 3156 | |
| 3157 | 3157 | |
| 3158 | 3158 | /* We should be done with options.. */ |
| 3159 | 3159 | verify_all_options(); |
| @@ -3188,11 +3188,11 @@ | ||
| 3188 | 3188 | fossil_fatal("unable to make %s the working directory", zWorkDir); |
| 3189 | 3189 | } |
| 3190 | 3190 | } |
| 3191 | 3191 | if( keepFlag==0 && bForce==0 && file_directory_size(".", 0, 1)>0 ){ |
| 3192 | 3192 | fossil_fatal("directory %s is not empty\n" |
| 3193 | - "use the --force option to override", file_getcwd(0,0)); | |
| 3193 | + "use the -f or --force option to override", file_getcwd(0,0)); | |
| 3194 | 3194 | } |
| 3195 | 3195 | |
| 3196 | 3196 | if( db_open_local_v2(0, allowNested) ){ |
| 3197 | 3197 | fossil_fatal("there is already an open tree at %s", g.zLocalRoot); |
| 3198 | 3198 | } |
| 3199 | 3199 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3111,11 +3111,11 @@ | |
| 3111 | ** |
| 3112 | ** Options: |
| 3113 | ** --empty Initialize checkout as being empty, but still connected |
| 3114 | ** with the local repository. If you commit this checkout, |
| 3115 | ** it will become a new "initial" commit in the repository. |
| 3116 | ** --force Continue with the open even if the working directory is |
| 3117 | ** not empty. |
| 3118 | ** --force-missing Force opening a repository with missing content |
| 3119 | ** --keep Only modify the manifest and manifest.uuid files |
| 3120 | ** --nested Allow opening a repository inside an opened checkout |
| 3121 | ** --repodir DIR If REPOSITORY is a URI that will be cloned, store |
| @@ -3149,11 +3149,11 @@ | |
| 3149 | forceMissingFlag = find_option("force-missing",0,0)!=0; |
| 3150 | allowNested = find_option("nested",0,0)!=0; |
| 3151 | setmtimeFlag = find_option("setmtime",0,0)!=0; |
| 3152 | zWorkDir = find_option("workdir",0,1); |
| 3153 | zRepoDir = find_option("repodir",0,1); |
| 3154 | bForce = find_option("force",0,0)!=0; |
| 3155 | zPwd = file_getcwd(0,0); |
| 3156 | |
| 3157 | |
| 3158 | /* We should be done with options.. */ |
| 3159 | verify_all_options(); |
| @@ -3188,11 +3188,11 @@ | |
| 3188 | fossil_fatal("unable to make %s the working directory", zWorkDir); |
| 3189 | } |
| 3190 | } |
| 3191 | if( keepFlag==0 && bForce==0 && file_directory_size(".", 0, 1)>0 ){ |
| 3192 | fossil_fatal("directory %s is not empty\n" |
| 3193 | "use the --force option to override", file_getcwd(0,0)); |
| 3194 | } |
| 3195 | |
| 3196 | if( db_open_local_v2(0, allowNested) ){ |
| 3197 | fossil_fatal("there is already an open tree at %s", g.zLocalRoot); |
| 3198 | } |
| 3199 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3111,11 +3111,11 @@ | |
| 3111 | ** |
| 3112 | ** Options: |
| 3113 | ** --empty Initialize checkout as being empty, but still connected |
| 3114 | ** with the local repository. If you commit this checkout, |
| 3115 | ** it will become a new "initial" commit in the repository. |
| 3116 | ** -f|--force Continue with the open even if the working directory is |
| 3117 | ** not empty. |
| 3118 | ** --force-missing Force opening a repository with missing content |
| 3119 | ** --keep Only modify the manifest and manifest.uuid files |
| 3120 | ** --nested Allow opening a repository inside an opened checkout |
| 3121 | ** --repodir DIR If REPOSITORY is a URI that will be cloned, store |
| @@ -3149,11 +3149,11 @@ | |
| 3149 | forceMissingFlag = find_option("force-missing",0,0)!=0; |
| 3150 | allowNested = find_option("nested",0,0)!=0; |
| 3151 | setmtimeFlag = find_option("setmtime",0,0)!=0; |
| 3152 | zWorkDir = find_option("workdir",0,1); |
| 3153 | zRepoDir = find_option("repodir",0,1); |
| 3154 | bForce = find_option("force","f",0)!=0; |
| 3155 | zPwd = file_getcwd(0,0); |
| 3156 | |
| 3157 | |
| 3158 | /* We should be done with options.. */ |
| 3159 | verify_all_options(); |
| @@ -3188,11 +3188,11 @@ | |
| 3188 | fossil_fatal("unable to make %s the working directory", zWorkDir); |
| 3189 | } |
| 3190 | } |
| 3191 | if( keepFlag==0 && bForce==0 && file_directory_size(".", 0, 1)>0 ){ |
| 3192 | fossil_fatal("directory %s is not empty\n" |
| 3193 | "use the -f or --force option to override", file_getcwd(0,0)); |
| 3194 | } |
| 3195 | |
| 3196 | if( db_open_local_v2(0, allowNested) ){ |
| 3197 | fossil_fatal("there is already an open tree at %s", g.zLocalRoot); |
| 3198 | } |
| 3199 |