rebase: Support preserving merges in non-interactive mode

diff --git a/interpolate.c b/interpolate.c
index 3de583238d854675ae872047a2d2b7fb09a66969..7f03bd99c5b66afa6cc7fa11a2430301a3042656 100644 (file)
--- a/interpolate.c
+++ b/interpolate.c
@@ -11,8 +11,7 @@ void interp_set_entry(struct interp *table, int slot, const char *value)
        char *oldval = table[slot].value;
        char *newval = NULL;
 
-       if (oldval)
-               free(oldval);
+       free(oldval);
 
        if (value)
                newval = xstrdup(value);
@@ -73,8 +72,12 @@ unsigned long interpolate(char *result, unsigned long reslen,
                        /* Check for valid interpolation. */
                        if (i < ninterps) {
                                value = interps[i].value;
-                               valuelen = strlen(value);
+                               if (!value) {
+                                       src += namelen;
+                                       continue;
+                               }
 
+                               valuelen = strlen(value);
                                if (newlen + valuelen < reslen) {
                                        /* Substitute. */
                                        memcpy(dest, value, valuelen);