tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

diff --git a/advice.c b/advice.c
index 3bc86260b8a2a809a379c91627f919ef0a529aa1..3eca9f5ffdd6e3596584ed0aa79e2634683bd496 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -13,6 +13,9 @@ int advice_commit_before_merge = 1;
 int advice_resolve_conflict = 1;
 int advice_implicit_identity = 1;
 int advice_detached_head = 1;
+int advice_set_upstream_failure = 1;
+int advice_object_name_warning = 1;
+int advice_rm_hints = 1;
 
 static struct {
        const char *name;
@@ -31,6 +34,9 @@ static struct {
        { "resolveconflict", &advice_resolve_conflict },
        { "implicitidentity", &advice_implicit_identity },
        { "detachedhead", &advice_detached_head },
+       { "setupstreamfailure", &advice_set_upstream_failure },
+       { "objectnamewarning", &advice_object_name_warning },
+       { "rmhints", &advice_rm_hints },
 
        /* make this an alias for backward compatibility */
        { "pushnonfastforward", &advice_push_update_rejected }