If a non-standard prefix is used by --no-prefix, --src-prefix,
or --dst-prefix options, the resulting diff becomes something
git-apply would not grok. In such a case, we should not trigger
the more strict check git-apply does for patches in "diff --git"
format.
This checks the prefix specified when generating diff. If src
and dst prefix are not one-level of directory name followed by a
slash (i.e. the standard "diff --git a/foo b/foo" is fine, a
custom "diff --git l/foo k/foo" is Ok, but "diff --git foo foo"
is NOT Ok), we are generating with a custom prefix that would
fail git-apply's stricter check. In such a case, we do not say
"diff --git" but just say "diff" in the header.
Metainformation (e.g. "index", "similarity", etc.) lines will
safely be ignored by patch and git-apply (even when the latter
parses a non-git diff output), so this patch does not bother
stripping them away.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
* I am signing this off, but I am not thinking straight today
and did not test it, so I will not commit it for now and
leave it in the list archive, to be commented on.
diff.c | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/diff.c b/diff.c
index b18c140..8321492 100644
--- a/diff.c
+++ b/diff.c
@@ -1233,6 +1233,18 @@ static const char *diff_funcname_pattern(struct diff_filespec *one)
return NULL;
}
+static int with_standard_prefix(struct diff_options *o)
+{
+ const char *slash;
+ slash = strchr(o->a_prefix, '/');
+ if (!slash || slash[1])
+ return 0;
+ slash = strchr(o->b_prefix, '/');
+ if (!slash || slash[1])
+ return 0;
+ return 1;
+}
+
static void builtin_diff(const char *name_a,
const char *name_b,
struct diff_filespec *one,
@@ -1246,12 +1258,15 @@ static void builtin_diff(const char *name_a,
char *a_one, *b_two;
const char *set = diff_get_color_opt(o, DIFF_METAINFO);
const char *reset = diff_get_color_opt(o, DIFF_RESET);
+ const char *gitdiff;
+
+ gitdiff = with_standard_prefix(o) ? " --git" : "";
a_one = quote_two(o->a_prefix, name_a + (*name_a == '/'));
b_two = quote_two(o->b_prefix, name_b + (*name_b == '/'));
lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
- printf("%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
+ printf("%sdiff%s %s %s%s\n", set, gitdiff, a_one, b_two, reset);
if (lbl[0][0] == '/') {
/* /dev/null */
printf("%snew file mode %06o%s\n", set, two->mode, reset);
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
