Fossil SCM
For commands where the --sha1sum option has changed to --hash, continue to accept --sha1sum for historical compatibility, though leave this undocumented.
Commit
d90e56f4697f12e30cbe7da47067b66ad83863ae
Parent
5776542195af292…
1 file changed
+4
-2
+4
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -464,11 +464,12 @@ | ||
| 464 | 464 | {"no-merge", C_MERGE }, {"no-classify", C_CLASSIFY }, |
| 465 | 465 | }; |
| 466 | 466 | |
| 467 | 467 | Blob report = BLOB_INITIALIZER; |
| 468 | 468 | enum {CHANGES, STATUS} command = *g.argv[1]=='s' ? STATUS : CHANGES; |
| 469 | - int useHash = find_option("hash", 0, 0)!=0; | |
| 469 | + /* --sha1sum is an undocumented alias for --hash for backwards compatiblity */ | |
| 470 | + int useHash = find_option("hash",0,0)!=0 || find_option("sha1sum",0,0)!=0; | |
| 470 | 471 | int showHdr = command==CHANGES && find_option("header", 0, 0); |
| 471 | 472 | int verboseFlag = command==CHANGES && find_option("verbose", "v", 0); |
| 472 | 473 | const char *zIgnoreFlag = find_option("ignore", 0, 1); |
| 473 | 474 | unsigned scanFlags = 0; |
| 474 | 475 | unsigned flags = 0; |
| @@ -2068,11 +2069,12 @@ | ||
| 2068 | 2069 | Blob ans; |
| 2069 | 2070 | char cReply; |
| 2070 | 2071 | |
| 2071 | 2072 | memset(&sCiInfo, 0, sizeof(sCiInfo)); |
| 2072 | 2073 | url_proxy_options(); |
| 2073 | - useHash = find_option("hash", 0, 0)!=0; | |
| 2074 | + /* --sha1sum is an undocumented alias for --hash for backwards compatiblity */ | |
| 2075 | + useHash = find_option("hash",0,0)!=0 || find_option("sha1sum",0,0)!=0; | |
| 2074 | 2076 | noSign = find_option("nosign",0,0)!=0; |
| 2075 | 2077 | forceDelta = find_option("delta",0,0)!=0; |
| 2076 | 2078 | forceBaseline = find_option("baseline",0,0)!=0; |
| 2077 | 2079 | if( forceDelta && forceBaseline ){ |
| 2078 | 2080 | fossil_fatal("cannot use --delta and --baseline together"); |
| 2079 | 2081 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -464,11 +464,12 @@ | |
| 464 | {"no-merge", C_MERGE }, {"no-classify", C_CLASSIFY }, |
| 465 | }; |
| 466 | |
| 467 | Blob report = BLOB_INITIALIZER; |
| 468 | enum {CHANGES, STATUS} command = *g.argv[1]=='s' ? STATUS : CHANGES; |
| 469 | int useHash = find_option("hash", 0, 0)!=0; |
| 470 | int showHdr = command==CHANGES && find_option("header", 0, 0); |
| 471 | int verboseFlag = command==CHANGES && find_option("verbose", "v", 0); |
| 472 | const char *zIgnoreFlag = find_option("ignore", 0, 1); |
| 473 | unsigned scanFlags = 0; |
| 474 | unsigned flags = 0; |
| @@ -2068,11 +2069,12 @@ | |
| 2068 | Blob ans; |
| 2069 | char cReply; |
| 2070 | |
| 2071 | memset(&sCiInfo, 0, sizeof(sCiInfo)); |
| 2072 | url_proxy_options(); |
| 2073 | useHash = find_option("hash", 0, 0)!=0; |
| 2074 | noSign = find_option("nosign",0,0)!=0; |
| 2075 | forceDelta = find_option("delta",0,0)!=0; |
| 2076 | forceBaseline = find_option("baseline",0,0)!=0; |
| 2077 | if( forceDelta && forceBaseline ){ |
| 2078 | fossil_fatal("cannot use --delta and --baseline together"); |
| 2079 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -464,11 +464,12 @@ | |
| 464 | {"no-merge", C_MERGE }, {"no-classify", C_CLASSIFY }, |
| 465 | }; |
| 466 | |
| 467 | Blob report = BLOB_INITIALIZER; |
| 468 | enum {CHANGES, STATUS} command = *g.argv[1]=='s' ? STATUS : CHANGES; |
| 469 | /* --sha1sum is an undocumented alias for --hash for backwards compatiblity */ |
| 470 | int useHash = find_option("hash",0,0)!=0 || find_option("sha1sum",0,0)!=0; |
| 471 | int showHdr = command==CHANGES && find_option("header", 0, 0); |
| 472 | int verboseFlag = command==CHANGES && find_option("verbose", "v", 0); |
| 473 | const char *zIgnoreFlag = find_option("ignore", 0, 1); |
| 474 | unsigned scanFlags = 0; |
| 475 | unsigned flags = 0; |
| @@ -2068,11 +2069,12 @@ | |
| 2069 | Blob ans; |
| 2070 | char cReply; |
| 2071 | |
| 2072 | memset(&sCiInfo, 0, sizeof(sCiInfo)); |
| 2073 | url_proxy_options(); |
| 2074 | /* --sha1sum is an undocumented alias for --hash for backwards compatiblity */ |
| 2075 | useHash = find_option("hash",0,0)!=0 || find_option("sha1sum",0,0)!=0; |
| 2076 | noSign = find_option("nosign",0,0)!=0; |
| 2077 | forceDelta = find_option("delta",0,0)!=0; |
| 2078 | forceBaseline = find_option("baseline",0,0)!=0; |
| 2079 | if( forceDelta && forceBaseline ){ |
| 2080 | fossil_fatal("cannot use --delta and --baseline together"); |
| 2081 |