merge-trees: push choice to renormalize away from low level
commit3e7589b7b3ff7a7aa93bec39c40603e370c51317
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 5 Aug 2010 11:13:49 +0000 (5 06:13 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Aug 2010 16:20:00 +0000 (6 09:20 -0700)
tree4df3a2089810c1e43f939a12c593bd0635084fa8
parentbeeeb45493332f38de2a3b58120c5bebb5863577
merge-trees: push choice to renormalize away from low level

The merge machinery decides whether to resmudge and clean relevant
entries based on the global merge_renormalize setting, which is set by
"git merge" based on its configuration (and left alone by other
commands).

A nicer interface would make that decision a parameter to merge_trees
so callers would pass in a choice made on a call-by-call basis.
Start by making blob_unchanged stop examining the merge_renormalize
global.

In other words, this change is a trivial no-op, but it brings us
closer to something good.

Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c