diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 06:24:58 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-06 09:20:01 -0700 |
| commit | 18b037a5b61532cba7f19efdb2e75c258d87d3d7 (patch) | |
| tree | c41f8c974a9728d7ab8ce495a4527e121240664c /ll-merge.c | |
| parent | 73cf7f713da4fc797e2393a9e490ad4ec9466c53 (diff) | |
| download | git-18b037a5b61532cba7f19efdb2e75c258d87d3d7.tar.gz | |
ll-merge: let caller decide whether to renormalize
Add a “renormalize” bit to the ll-merge options word 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.
This reveals a few commands that have not been taking that situation
into account, though it does not fix them.
No functional change intended.
Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ll-merge.c b/ll-merge.c index 290f764f56..6bb3095c3a 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -99,8 +99,8 @@ static int ll_union_merge(const struct ll_merge_driver *drv_unused, int flag, int marker_size) { /* Use union favor */ - flag = (flag & LL_OPT_VIRTUAL_ANCESTOR) | - create_ll_flag(XDL_MERGE_FAVOR_UNION); + flag &= ~LL_OPT_FAVOR_MASK; + flag |= create_ll_flag(XDL_MERGE_FAVOR_UNION); return ll_xdl_merge(drv_unused, result, path_unused, orig, NULL, src1, NULL, src2, NULL, flag, marker_size); @@ -345,7 +345,7 @@ int ll_merge(mmbuffer_t *result_buf, const struct ll_merge_driver *driver; int virtual_ancestor = flag & LL_OPT_VIRTUAL_ANCESTOR; - if (merge_renormalize) { + if (flag & LL_OPT_RENORMALIZE) { normalize_file(ancestor, path); normalize_file(ours, path); normalize_file(theirs, path); |