Browse Source

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>
maint
Linus Torvalds 19 years ago committed by Junio C Hamano
parent
commit
694a764fc2
  1. 2
      diff.c

2
diff.c

@ -174,7 +174,7 @@ static void builtin_diff(const char *name_a, @@ -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;

Loading…
Cancel
Save