Fossil SCM
Previous check-in incorrect for "fossil diff". Fixed here.
Commit
766380a9d6e6d29f2844f6d1b666585fb794fb19208c36a74ea0d4efe9123045
Parent
954fb421e16ea89…
1 file changed
+13
-11
+13
-11
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -1170,24 +1170,26 @@ | ||
| 1170 | 1170 | const char *zResult; |
| 1171 | 1171 | const char *zName; |
| 1172 | 1172 | |
| 1173 | 1173 | zName = guiDiff ? "gdiff-command" : "diff-command"; |
| 1174 | 1174 | zResult = db_get(zName, ""); |
| 1175 | - if( zResult[0]==0 && guiDiff ){ | |
| 1176 | - static const char *azGuiDiff[] = { | |
| 1175 | + if( zResult[0]==0 ){ | |
| 1176 | + zResult = 0; | |
| 1177 | + if( guiDiff ){ | |
| 1178 | + static const char *azGuiDiff[] = { | |
| 1177 | 1179 | #if defined(_WIN32) |
| 1178 | - "winmergeu", "meld", "kdiff3", "bcompare", "vimdiff", "examdiff" | |
| 1180 | + "winmergeu", "meld", "kdiff3", "bcompare", "vimdiff", "examdiff" | |
| 1179 | 1181 | #else |
| 1180 | - "meld", "kdiff3" | |
| 1182 | + "meld", "kdiff3" | |
| 1181 | 1183 | #endif |
| 1182 | - }; | |
| 1183 | - int i; | |
| 1184 | - zResult = 0; | |
| 1185 | - for(i=0; i<count(azGuiDiff); i++){ | |
| 1186 | - if( fossil_app_on_path(azGuiDiff[i], 0) ){ | |
| 1187 | - zResult = azGuiDiff[i]; | |
| 1188 | - break; | |
| 1184 | + }; | |
| 1185 | + int i; | |
| 1186 | + for(i=0; i<count(azGuiDiff); i++){ | |
| 1187 | + if( fossil_app_on_path(azGuiDiff[i], 0) ){ | |
| 1188 | + zResult = azGuiDiff[i]; | |
| 1189 | + break; | |
| 1190 | + } | |
| 1189 | 1191 | } |
| 1190 | 1192 | } |
| 1191 | 1193 | } |
| 1192 | 1194 | return zResult; |
| 1193 | 1195 | } |
| 1194 | 1196 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1170,24 +1170,26 @@ | |
| 1170 | const char *zResult; |
| 1171 | const char *zName; |
| 1172 | |
| 1173 | zName = guiDiff ? "gdiff-command" : "diff-command"; |
| 1174 | zResult = db_get(zName, ""); |
| 1175 | if( zResult[0]==0 && guiDiff ){ |
| 1176 | static const char *azGuiDiff[] = { |
| 1177 | #if defined(_WIN32) |
| 1178 | "winmergeu", "meld", "kdiff3", "bcompare", "vimdiff", "examdiff" |
| 1179 | #else |
| 1180 | "meld", "kdiff3" |
| 1181 | #endif |
| 1182 | }; |
| 1183 | int i; |
| 1184 | zResult = 0; |
| 1185 | for(i=0; i<count(azGuiDiff); i++){ |
| 1186 | if( fossil_app_on_path(azGuiDiff[i], 0) ){ |
| 1187 | zResult = azGuiDiff[i]; |
| 1188 | break; |
| 1189 | } |
| 1190 | } |
| 1191 | } |
| 1192 | return zResult; |
| 1193 | } |
| 1194 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1170,24 +1170,26 @@ | |
| 1170 | const char *zResult; |
| 1171 | const char *zName; |
| 1172 | |
| 1173 | zName = guiDiff ? "gdiff-command" : "diff-command"; |
| 1174 | zResult = db_get(zName, ""); |
| 1175 | if( zResult[0]==0 ){ |
| 1176 | zResult = 0; |
| 1177 | if( guiDiff ){ |
| 1178 | static const char *azGuiDiff[] = { |
| 1179 | #if defined(_WIN32) |
| 1180 | "winmergeu", "meld", "kdiff3", "bcompare", "vimdiff", "examdiff" |
| 1181 | #else |
| 1182 | "meld", "kdiff3" |
| 1183 | #endif |
| 1184 | }; |
| 1185 | int i; |
| 1186 | for(i=0; i<count(azGuiDiff); i++){ |
| 1187 | if( fossil_app_on_path(azGuiDiff[i], 0) ){ |
| 1188 | zResult = azGuiDiff[i]; |
| 1189 | break; |
| 1190 | } |
| 1191 | } |
| 1192 | } |
| 1193 | } |
| 1194 | return zResult; |
| 1195 | } |
| 1196 |