Merge branch 'mg/rebase-i-onto-reflog-in-full'

diff --git a/builtin/apply.c b/builtin/apply.c
index 069cf341b653080e2bae64faa0a00b387f88c961..3bf71dc4522564463945673aaba0501a51141bb2 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -188,7 +188,6 @@ struct patch {
        int is_new, is_delete;  /* -1 = unknown, 0 = false, 1 = true */
        int rejected;
        unsigned ws_rule;
-       unsigned long deflate_origlen;
        int lines_added, lines_deleted;
        int score;
        unsigned int is_toplevel_relative:1;
@@ -3769,7 +3768,8 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
        ce = xcalloc(1, ce_size);
        memcpy(ce->name, path, namelen);
        ce->ce_mode = create_ce_mode(mode);
-       ce->ce_flags = namelen;
+       ce->ce_flags = create_ce_flags(0);
+       ce->ce_namelen = namelen;
        if (S_ISGITLINK(mode)) {
                const char *s = buf;
 
@@ -3890,7 +3890,8 @@ static void add_conflicted_stages_file(struct patch *patch)
                ce = xcalloc(1, ce_size);
                memcpy(ce->name, patch->new_name, namelen);
                ce->ce_mode = create_ce_mode(mode);
-               ce->ce_flags = create_ce_flags(namelen, stage);
+               ce->ce_flags = create_ce_flags(stage);
+               ce->ce_namelen = namelen;
                hashcpy(ce->sha1, patch->threeway_stage[stage - 1]);
                if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
                        die(_("unable to add cache entry for %s"), patch->new_name);