diff-no-index: do not take a redundant prefix argument

pclouds · gitster · commit e5f7a5d16f2c · 2016-01-21T10:45:11.000-08:00
Prefix is already set up in "revs". The same prefix should be used for
all options parsing. So kill the last argument. This patch does not
actually change anything because the only caller does use the same
prefix for init_revisions() and diff_no_index().

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/diff.c b/builtin/diff.c
@@ -341,7 +341,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 	}
 	if (no_index)
 		/* If this is a no-index diff, just run it and exit there. */
-		diff_no_index(&rev, argc, argv, prefix);
+		diff_no_index(&rev, argc, argv);
 
 	/* Otherwise, we are doing the usual "git" diff */
 	rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
diff --git a/diff-no-index.c b/diff-no-index.c
@@ -239,12 +239,12 @@ static void fixup_paths(const char **path, struct strbuf *replacement)
 }
 
 void diff_no_index(struct rev_info *revs,
-		   int argc, const char **argv,
-		   const char *prefix)
+		   int argc, const char **argv)
 {
 	int i, prefixlen;
 	const char *paths[2];
 	struct strbuf replacement = STRBUF_INIT;
+	const char *prefix = revs->prefix;
 
 	diff_setup(&revs->diffopt);
 	for (i = 1; i < argc - 2; ) {
diff --git a/diff.h b/diff.h
@@ -345,7 +345,7 @@ extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
 
 extern int diff_result_code(struct diff_options *, int);
 
-extern void diff_no_index(struct rev_info *, int, const char **, const char *);
+extern void diff_no_index(struct rev_info *, int, const char **);
 
 extern int index_differs_from(const char *def, int diff_flags);
 

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ int cmd_diff(int argc, const char *argv, const char prefix)`
`341`	`341`	`}`
`342`	`342`	`if (no_index)`
`343`	`343`	`/* If this is a no-index diff, just run it and exit there. */`
`344`		`- diff_no_index(&rev, argc, argv, prefix);`
	`344`	`+ diff_no_index(&rev, argc, argv);`
`345`	`345`
`346`	`346`	`/* Otherwise, we are doing the usual "git" diff */`
`347`	`347`	`rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;`
Original file line number	Diff line number	Diff line change
`@@ -239,12 +239,12 @@ static void fixup_paths(const char *path, struct strbuf replacement)`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`void diff_no_index(struct rev_info *revs,`
`242`		`- int argc, const char **argv,`
`243`		`- const char *prefix)`
	`242`	`+ int argc, const char **argv)`
`244`	`243`	`{`
`245`	`244`	`int i, prefixlen;`
`246`	`245`	`const char *paths[2];`
`247`	`246`	`struct strbuf replacement = STRBUF_INIT;`
	`247`	`+ const char *prefix = revs->prefix;`
`248`	`248`
`249`	`249`	`diff_setup(&revs->diffopt);`
`250`	`250`	`for (i = 1; i < argc - 2; ) {`