Diff
Not logged in

Differences From:

File src/diffcmd.c part of check-in [aeaee1f385] - Add extra quoted to system() calls on windows. Ticket 8d073be8808b. Also update to the latest SQLite. by drh on 2009-09-10 23:00:22. [view]

To:

File src/diffcmd.c part of check-in [129edda98e] - Update to the latest SQLite. Fix a bug in the "diff" and "gdiff" commands. Fix a bug that prevented "fossil config pull" from working. by drh on 2009-09-11 15:06:34. [view]

@@ -170,12 +170,13 @@
       zExternalCommand = db_get("gdiff-command", 0);
     }
     if( zExternalCommand==0 ){
       internalDiff=1;
-    }
-    blob_zero(&cmd);
-    shell_escape(&cmd, zExternalCommand);
-    blob_append(&cmd, " ", 1);
+    }else{
+      blob_zero(&cmd);
+      shell_escape(&cmd, zExternalCommand);
+      blob_append(&cmd, " ", 1);
+    }
   }
   zFile = g.argv[g.argc-1];
   file_tree_name(zFile, &fname, 1);