Merge branch 'jn/mailmap-update' into maint

diff --git a/entry.c b/entry.c
index 30211447ac839899d2c232af232c95312856816c..2a2ab6c839490aba1b9d2723b8e05837855f5b39 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "blob.h"
+#include "object-store.h"
 #include "dir.h"
 #include "streaming.h"
 #include "submodule.h"
@@ -85,12 +86,12 @@ static int create_file(const char *path, unsigned int mode)
 static void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
 {
        enum object_type type;
-       void *new = read_sha1_file(ce->oid.hash, &type, size);
+       void *blob_data = read_object_file(&ce->oid, &type, size);
 
-       if (new) {
+       if (blob_data) {
                if (type == OBJ_BLOB)
-                       return new;
-               free(new);
+                       return blob_data;
+               free(blob_data);
        }
        return NULL;
 }
@@ -256,7 +257,7 @@ static int write_entry(struct cache_entry *ce,
        unsigned int ce_mode_s_ifmt = ce->ce_mode & S_IFMT;
        struct delayed_checkout *dco = state->delayed_checkout;
        int fd, ret, fstat_done = 0;
-       char *new;
+       char *new_blob;
        struct strbuf buf = STRBUF_INIT;
        unsigned long size;
        ssize_t wrote;
@@ -265,8 +266,8 @@ static int write_entry(struct cache_entry *ce,
        const struct submodule *sub;
 
        if (ce_mode_s_ifmt == S_IFREG) {
-               struct stream_filter *filter = get_stream_filter(ce->name,
-                                                                ce->oid.hash);
+               struct stream_filter *filter = get_stream_filter(state->istate, ce->name,
+                                                                &ce->oid);
                if (filter &&
                    !streaming_write_entry(ce, path, filter,
                                           state, to_tempfile,
@@ -276,8 +277,8 @@ static int write_entry(struct cache_entry *ce,
 
        switch (ce_mode_s_ifmt) {
        case S_IFLNK:
-               new = read_blob_entry(ce, &size);
-               if (!new)
+               new_blob = read_blob_entry(ce, &size);
+               if (!new_blob)
                        return error("unable to read sha1 file of %s (%s)",
                                     path, oid_to_hex(&ce->oid));
 
@@ -288,8 +289,8 @@ static int write_entry(struct cache_entry *ce,
                if (!has_symlinks || to_tempfile)
                        goto write_file_entry;
 
-               ret = symlink(new, path);
-               free(new);
+               ret = symlink(new_blob, path);
+               free(new_blob);
                if (ret)
                        return error_errno("unable to create symlink %s", path);
                break;
@@ -300,11 +301,11 @@ static int write_entry(struct cache_entry *ce,
                 * bother reading it at all.
                 */
                if (dco && dco->state == CE_RETRY) {
-                       new = NULL;
+                       new_blob = NULL;
                        size = 0;
                } else {
-                       new = read_blob_entry(ce, &size);
-                       if (!new)
+                       new_blob = read_blob_entry(ce, &size);
+                       if (!new_blob)
                                return error("unable to read sha1 file of %s (%s)",
                                             path, oid_to_hex(&ce->oid));
                }
@@ -313,18 +314,18 @@ static int write_entry(struct cache_entry *ce,
                 * Convert from git internal format to working tree format
                 */
                if (dco && dco->state != CE_NO_DELAY) {
-                       ret = async_convert_to_working_tree(ce->name, new,
+                       ret = async_convert_to_working_tree(state->istate, ce->name, new_blob,
                                                            size, &buf, dco);
                        if (ret && string_list_has_string(&dco->paths, ce->name)) {
-                               free(new);
+                               free(new_blob);
                                goto delayed;
                        }
                } else
-                       ret = convert_to_working_tree(ce->name, new, size, &buf);
+                       ret = convert_to_working_tree(state->istate, ce->name, new_blob, size, &buf);
 
                if (ret) {
-                       free(new);
-                       new = strbuf_detach(&buf, &newsize);
+                       free(new_blob);
+                       new_blob = strbuf_detach(&buf, &newsize);
                        size = newsize;
                }
                /*
@@ -336,15 +337,15 @@ static int write_entry(struct cache_entry *ce,
        write_file_entry:
                fd = open_output_fd(path, ce, to_tempfile);
                if (fd < 0) {
-                       free(new);
+                       free(new_blob);
                        return error_errno("unable to create file %s", path);
                }
 
-               wrote = write_in_full(fd, new, size);
+               wrote = write_in_full(fd, new_blob, size);
                if (!to_tempfile)
                        fstat_done = fstat_output(fd, state, &st);
                close(fd);
-               free(new);
+               free(new_blob);
                if (wrote < 0)
                        return error("unable to write file %s", path);
                break;
@@ -421,7 +422,8 @@ int checkout_entry(struct cache_entry *ce,
 
        if (!check_path(path.buf, path.len, &st, state->base_dir_len)) {
                const struct submodule *sub;
-               unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
+               unsigned changed = ie_match_stat(state->istate, ce, &st,
+                                                CE_MATCH_IGNORE_VALID | CE_MATCH_IGNORE_SKIP_WORKTREE);
                /*
                 * Needs to be checked before !changed returns early,
                 * as the possibly empty directory was not changed