Make sure the empty tree exists when needed in merge-recursive.

diff --git a/revision.c b/revision.c
index 3dbc26c49c585088ff4861992ce70a94465df401..993bb668a205a9fb3e2f5ddd2f378f10ac7905b4 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -657,6 +657,13 @@ int handle_revision_arg(const char *arg, struct rev_info *revs,
                        return 0;
                *dotdot = '^';
        }
+       dotdot = strstr(arg, "^!");
+       if (dotdot && !dotdot[2]) {
+               *dotdot = 0;
+               if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
+                       *dotdot = '^';
+       }
+
        local_flags = 0;
        if (*arg == '^') {
                local_flags = UNINTERESTING;