> diff --git contrib/git-jump/git-jump contrib/git-jump/git-jump
> index a33674e..dc90cd6 100755
> --- contrib/git-jump/git-jump
> +++ contrib/git-jump/git-jump
Apparently diff.noprefix also applies to git format-patch. Even though
git am does explicitly support -p0, I would argue against diff options
creating non-standard patches.
-- >8 --
Subject: [PATCH/RFC] format-patch: force default file prefixes in diff
Override user configuration (eg. diff.noprefix) in patches intended for
external consumption to match the default prefixes expected by git-am.
Signed-off-by: Mischa POSLAWSKY <g...@shiar.nl>
---
builtin/log.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/builtin/log.c b/builtin/log.c
index dff7921..91ded25 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1131,6 +1131,8 @@ int cmd_format_patch(int argc, const char **argv, const
char *prefix)
rev.diff = 1;
rev.max_parents = 1;
DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
+ rev.diffopt.a_prefix = "a/";
+ rev.diffopt.b_prefix = "b/";
rev.subject_prefix = fmt_patch_subject_prefix;
memset(&s_r_opt, 0, sizeof(s_r_opt));
s_r_opt.def = "HEAD";
--
1.7.12.166.ga54f379
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
