summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-05 11:15:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-06 16:20:00 (GMT)
commit1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4 (patch)
treee342fb1ebe7e0d14874ae0b02033640dfa23793d
parent3e7589b7b3ff7a7aa93bec39c40603e370c51317 (diff)
downloadgit-1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4.zip
git-1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4.tar.gz
git-1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4.tar.bz2
merge-trees: let caller decide whether to renormalize
Add a "renormalize" option to struct merge_options so callers can decide on a case-by-case basis whether the merge is likely to have overlapped with a change in smudge/clean rules. The option defaults to the global merge_renormalize setting for now. No change in behavior intended. Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--merge-recursive.c3
-rw-r--r--merge-recursive.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 2b55fc2..8a49844 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1112,7 +1112,7 @@ static int process_entry(struct merge_options *o,
print_index_entry("\tpath: ", entry);
*/
int clean_merge = 1;
- int normalize = merge_renormalize;
+ int normalize = o->renormalize;
unsigned o_mode = entry->stages[1].mode;
unsigned a_mode = entry->stages[2].mode;
unsigned b_mode = entry->stages[3].mode;
@@ -1484,6 +1484,7 @@ void init_merge_options(struct merge_options *o)
o->buffer_output = 1;
o->diff_rename_limit = -1;
o->merge_rename_limit = -1;
+ o->renormalize = merge_renormalize;
git_config(merge_recursive_config, o);
if (getenv("GIT_MERGE_VERBOSITY"))
o->verbosity =
diff --git a/merge-recursive.h b/merge-recursive.h
index b831293..c5fbe79 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -14,6 +14,7 @@ struct merge_options {
} recursive_variant;
const char *subtree_shift;
unsigned buffer_output : 1;
+ unsigned renormalize : 1;
int verbosity;
int diff_rename_limit;
int merge_rename_limit;