Fossil SCM
Restored "diff --command CMD" flag that got lost in the latest diff refactorings. (One-off method for supplying the diff-command setting.)
Commit
cae7036bb7f07c1ba9f831abde508d33b02ce27f0038355065726b2e2c5b617c
Parent
d6e7917a3e66629…
1 file changed
+2
-1
+2
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2881,11 +2881,12 @@ | ||
| 2881 | 2881 | if( find_option("invert",0,0)!=0 ) diffFlags |= DIFF_INVERT; |
| 2882 | 2882 | if( find_option("brief",0,0)!=0 ) diffFlags |= DIFF_BRIEF; |
| 2883 | 2883 | if( find_option("internal","i",0)==0 |
| 2884 | 2884 | && (diffFlags & (DIFF_HTML|DIFF_TCL|DIFF_DEBUG|DIFF_JSON))==0 |
| 2885 | 2885 | ){ |
| 2886 | - pCfg->zDiffCmd = diff_command_external(isGDiff); | |
| 2886 | + pCfg->zDiffCmd = find_option("command", 0, 1); | |
| 2887 | + if( pCfg->zDiffCmd==0 ) pCfg->zDiffCmd = diff_command_external(isGDiff); | |
| 2887 | 2888 | if( pCfg->zDiffCmd ){ |
| 2888 | 2889 | const char *zDiffBinary; |
| 2889 | 2890 | pCfg->zBinGlob = diff_get_binary_glob(); |
| 2890 | 2891 | zDiffBinary = find_option("diff-binary", 0, 1); |
| 2891 | 2892 | if( zDiffBinary ){ |
| 2892 | 2893 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2881,11 +2881,12 @@ | |
| 2881 | if( find_option("invert",0,0)!=0 ) diffFlags |= DIFF_INVERT; |
| 2882 | if( find_option("brief",0,0)!=0 ) diffFlags |= DIFF_BRIEF; |
| 2883 | if( find_option("internal","i",0)==0 |
| 2884 | && (diffFlags & (DIFF_HTML|DIFF_TCL|DIFF_DEBUG|DIFF_JSON))==0 |
| 2885 | ){ |
| 2886 | pCfg->zDiffCmd = diff_command_external(isGDiff); |
| 2887 | if( pCfg->zDiffCmd ){ |
| 2888 | const char *zDiffBinary; |
| 2889 | pCfg->zBinGlob = diff_get_binary_glob(); |
| 2890 | zDiffBinary = find_option("diff-binary", 0, 1); |
| 2891 | if( zDiffBinary ){ |
| 2892 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2881,11 +2881,12 @@ | |
| 2881 | if( find_option("invert",0,0)!=0 ) diffFlags |= DIFF_INVERT; |
| 2882 | if( find_option("brief",0,0)!=0 ) diffFlags |= DIFF_BRIEF; |
| 2883 | if( find_option("internal","i",0)==0 |
| 2884 | && (diffFlags & (DIFF_HTML|DIFF_TCL|DIFF_DEBUG|DIFF_JSON))==0 |
| 2885 | ){ |
| 2886 | pCfg->zDiffCmd = find_option("command", 0, 1); |
| 2887 | if( pCfg->zDiffCmd==0 ) pCfg->zDiffCmd = diff_command_external(isGDiff); |
| 2888 | if( pCfg->zDiffCmd ){ |
| 2889 | const char *zDiffBinary; |
| 2890 | pCfg->zBinGlob = diff_get_binary_glob(); |
| 2891 | zDiffBinary = find_option("diff-binary", 0, 1); |
| 2892 | if( zDiffBinary ){ |
| 2893 |