Add git-name-rev

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 823c8d0..ec94a96 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -174,7 +174,7 @@ static void builtin_diff(const char *name_a,
 {
        int i, next_at, cmd_size;
        const char *const diff_cmd = "diff -L%s -L%s";
-       const char *const diff_arg  = "%s %s||:"; /* "||:" is to return 0 */
+       const char *const diff_arg  = "-- %s %s||:"; /* "||:" is to return 0 */
        const char *input_name_sq[2];
        const char *label_path[2];
        char *cmd;
@@ -754,6 +754,9 @@ void diff_setup(struct diff_options *options)
        options->line_termination = '\n';
        options->break_opt = -1;
        options->rename_limit = -1;
+
+       options->change = diff_change;
+       options->add_remove = diff_addremove;
 }
 
 int diff_setup_done(struct diff_options *options)