Fossil SCM
Corrected new cherry-pick merge alias to account for users entering a partial command name like 'cher'. Reported Martin G. in /chat.
Commit
7ffc999f05b251d9137c2dbf846f26ffa2ba99b730dab27f1aaf1f9c8d11d64b
Parent
12fc5dc7ce96ad6…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -366,11 +366,11 @@ | ||
| 366 | 366 | forceMissingFlag = find_option("force-missing",0,0)!=0; |
| 367 | 367 | if( !verboseFlag ){ |
| 368 | 368 | verboseFlag = find_option("detail",0,0)!=0; /* deprecated */ |
| 369 | 369 | } |
| 370 | 370 | pickFlag = find_option("cherrypick",0,0)!=0; |
| 371 | - if(0==fossil_strcmp("cherry-pick", g.zCmdName)){ | |
| 371 | + if('c'==*g.zCmdName/*called as cherry-pick, possibly a short form*/){ | |
| 372 | 372 | pickFlag = 1; |
| 373 | 373 | } |
| 374 | 374 | integrateFlag = find_option("integrate",0,0)!=0; |
| 375 | 375 | backoutFlag = find_option("backout",0,0)!=0; |
| 376 | 376 | zBinGlob = find_option("binary",0,1); |
| 377 | 377 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -366,11 +366,11 @@ | |
| 366 | forceMissingFlag = find_option("force-missing",0,0)!=0; |
| 367 | if( !verboseFlag ){ |
| 368 | verboseFlag = find_option("detail",0,0)!=0; /* deprecated */ |
| 369 | } |
| 370 | pickFlag = find_option("cherrypick",0,0)!=0; |
| 371 | if(0==fossil_strcmp("cherry-pick", g.zCmdName)){ |
| 372 | pickFlag = 1; |
| 373 | } |
| 374 | integrateFlag = find_option("integrate",0,0)!=0; |
| 375 | backoutFlag = find_option("backout",0,0)!=0; |
| 376 | zBinGlob = find_option("binary",0,1); |
| 377 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -366,11 +366,11 @@ | |
| 366 | forceMissingFlag = find_option("force-missing",0,0)!=0; |
| 367 | if( !verboseFlag ){ |
| 368 | verboseFlag = find_option("detail",0,0)!=0; /* deprecated */ |
| 369 | } |
| 370 | pickFlag = find_option("cherrypick",0,0)!=0; |
| 371 | if('c'==*g.zCmdName/*called as cherry-pick, possibly a short form*/){ |
| 372 | pickFlag = 1; |
| 373 | } |
| 374 | integrateFlag = find_option("integrate",0,0)!=0; |
| 375 | backoutFlag = find_option("backout",0,0)!=0; |
| 376 | zBinGlob = find_option("binary",0,1); |
| 377 |