Handle "-" at beginning of filenames, part 3

This fixes the default built-in exec() of "diff" to add a "--" before the
filenames, so that if a filename starts with a "-", the diff program won't
think it's an option.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/diff.c b/diff.c
index 823c8d0aabe7d68a6dd0c4b3311ecff64710ea6e..306bcd9807803f37dd742ff5c479c4875c454e03 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;