diff options
author | Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> | 2010-07-02 23:20:47 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-07-03 02:43:15 +0400 |
commit | f217f0e86dc7bacc5dc127982eaadca758b558ce (patch) | |
tree | ffd4e74f1b5fb99e6434351354487f2d08c039f3 /builtin | |
parent | 492b10766f499b60bdc867c253f36d274ac51538 (diff) |
Avoid conflicts when merging branches with mixed normalization
Currently, merging across changes in line ending normalization is
painful since files containing CRLF will conflict with normalized files,
even if the only difference between the two versions is the line
endings. Additionally, any "real" merge conflicts that exist are
obscured because every line in the file has a conflict.
Assume you start out with a repo that has a lot of text files with CRLF
checked in (A):
o---C
/ \
A---B---D
B: Add "* text=auto" to .gitattributes and normalize all files to
LF-only
C: Modify some of the text files
D: Try to merge C
You will get a ridiculous number of LF/CRLF conflicts when trying to
merge C into D, since the repository contents for C are "wrong" wrt the
new .gitattributes file.
Fix ll-merge so that the "base", "theirs" and "ours" stages are passed
through convert_to_worktree() and convert_to_git() before a three-way
merge. This ensures that all three stages are normalized in the same
way, removing from consideration differences that are only due to
normalization.
This feature is optional for now since it changes a low-level mechanism
and is not necessary for the majority of users. The "merge.renormalize"
config variable enables it.
Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 37ce4f589f..b836e9c68b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -503,6 +503,9 @@ static int git_merge_config(const char *k, const char *v, void *cb) return git_config_string(&pull_octopus, k, v); else if (!strcmp(k, "merge.log") || !strcmp(k, "merge.summary")) option_log = git_config_bool(k, v); + else if (!strcmp(k, "merge.renormalize")) { + merge_renormalize = git_config_bool(k, v); + } return git_diff_ui_config(k, v, cb); } |