From: Linus Torvalds Date: Tue, 18 Oct 2005 05:57:53 GMT Subject: Handle "-" at beginning of filenames, part 3 Message-ID: In-Reply-To: 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 --- This should complete the series. Now all the parts should be safe and pass on "--" properly. Knock wood. On Mon, 17 Oct 2005, Linus Torvalds wrote: > > It adds "--" to the git-diff.sh scripts, to keep any filenames that start > with a "-" from being confused with an option. diff --git a/diff.c b/diff.c index cbb8632..d6b5086 100644 --- a/diff.c +++ b/diff.c @@ -134,7 +134,7 @@ static void builtin_diff(const char *nam { int i, next_at, cmd_size; const char *const diff_cmd = "diff -L%s%s -L%s%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 *path0[2]; const char *path1[2];