summaryrefslogtreecommitdiff
path: root/builtin/rerere.c
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2014-04-30 04:08:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-30 17:30:02 (GMT)
commitde3d8bb7736cafae0ff10e047e2afa994b1dd901 (patch)
tree50e012639e64906fd9909829d32732d30da767d7 /builtin/rerere.c
parent7bbc4e8fdb33e0a8e42e77cc05460d4c4f615f4d (diff)
downloadgit-de3d8bb7736cafae0ff10e047e2afa994b1dd901.zip
git-de3d8bb7736cafae0ff10e047e2afa994b1dd901.tar.gz
git-de3d8bb7736cafae0ff10e047e2afa994b1dd901.tar.bz2
rerere: fix for merge.conflictstyle
If we use a different conflict style `git rerere forget` is not able to find the matching conflict SHA-1 because the diff generated is actually different from what `git merge` generated, due to the XDL_MERGE_* option differences among the codepaths. The fix is to call git_xmerge_config() so that git_xmerge_style is set properly and the diffs match. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rerere.c')
-rw-r--r--builtin/rerere.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c
index 4e51add..98eb8c5 100644
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -60,6 +60,8 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, rerere_usage, 0);
+ git_config(git_xmerge_config, NULL);
+
if (autoupdate == 1)
flags = RERERE_AUTOUPDATE;
if (autoupdate == 0)