Fossil SCM
Correct mishandling of -tk, -by, etc. flags to the (patch diff) subcommand.
Commit
c55f0d91bbbbb39ec30a723d408408bbb1b8f8bb23ad0d14efd4d05b9cd98788
Parent
fc8d306a5f0edc9…
1 file changed
+1
-1
+1
-1
| --- src/patch.c | ||
| +++ src/patch.c | ||
| @@ -948,14 +948,14 @@ | ||
| 948 | 948 | diff_tk("patch diff", 3); |
| 949 | 949 | return; |
| 950 | 950 | } |
| 951 | 951 | db_find_and_open_repository(0, 0); |
| 952 | 952 | if( find_option("force","f",0) ) flags |= PATCH_FORCE; |
| 953 | + diff_options(&DCfg, zCmd[0]=='g', 0); | |
| 953 | 954 | verify_all_options(); |
| 954 | 955 | zIn = patch_find_patch_filename("apply"); |
| 955 | 956 | patch_attach(zIn, stdin); |
| 956 | - diff_options(&DCfg, zCmd[0]=='g', 0); | |
| 957 | 957 | patch_diff(flags, &DCfg); |
| 958 | 958 | fossil_free(zIn); |
| 959 | 959 | }else |
| 960 | 960 | if( strncmp(zCmd, "pull", n)==0 ){ |
| 961 | 961 | FILE *pIn = 0; |
| 962 | 962 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -948,14 +948,14 @@ | |
| 948 | diff_tk("patch diff", 3); |
| 949 | return; |
| 950 | } |
| 951 | db_find_and_open_repository(0, 0); |
| 952 | if( find_option("force","f",0) ) flags |= PATCH_FORCE; |
| 953 | verify_all_options(); |
| 954 | zIn = patch_find_patch_filename("apply"); |
| 955 | patch_attach(zIn, stdin); |
| 956 | diff_options(&DCfg, zCmd[0]=='g', 0); |
| 957 | patch_diff(flags, &DCfg); |
| 958 | fossil_free(zIn); |
| 959 | }else |
| 960 | if( strncmp(zCmd, "pull", n)==0 ){ |
| 961 | FILE *pIn = 0; |
| 962 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -948,14 +948,14 @@ | |
| 948 | diff_tk("patch diff", 3); |
| 949 | return; |
| 950 | } |
| 951 | db_find_and_open_repository(0, 0); |
| 952 | if( find_option("force","f",0) ) flags |= PATCH_FORCE; |
| 953 | diff_options(&DCfg, zCmd[0]=='g', 0); |
| 954 | verify_all_options(); |
| 955 | zIn = patch_find_patch_filename("apply"); |
| 956 | patch_attach(zIn, stdin); |
| 957 | patch_diff(flags, &DCfg); |
| 958 | fossil_free(zIn); |
| 959 | }else |
| 960 | if( strncmp(zCmd, "pull", n)==0 ){ |
| 961 | FILE *pIn = 0; |
| 962 |