From: Linus Torvalds Date: Tue, 18 Oct 2005 07:16:45 +0000 (-0700) Subject: Handle "-" at beginning of filenames, part 3 X-Git-Tag: v0.99.9~91 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=694a764fc2af9463c2462ab1fc92b442fce1a54c;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/diff.c b/diff.c index 823c8d0aa..306bcd980 100644 --- 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;