Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX)

diff --git a/builtin-apply.c b/builtin-apply.c
index 2811c0fe4d10c94bd6e4fc5964f62466bcc03230..6d5a60214ca5de6cb4376a66503cb8149b7ef997 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -635,7 +635,7 @@ static int gitdiff_index(const char *line, struct patch *patch)
        memcpy(patch->new_sha1_prefix, line, len);
        patch->new_sha1_prefix[len] = 0;
        if (*ptr == ' ')
-               patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
+               patch->old_mode = strtoul(ptr+1, NULL, 8);
        return 0;
 }
 
@@ -2452,6 +2452,8 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
        if (st_mode != patch->old_mode)
                fprintf(stderr, "warning: %s has type %o, expected %o\n",
                        old_name, st_mode, patch->old_mode);
+       if (!patch->new_mode)
+               patch->new_mode = st_mode;
        return 0;
 
  is_new: