Merge branch 'maint'

diff --git a/merge-recursive.c b/merge-recursive.c
index 048cca1d13fa72540b6e989618f1490c04dc1eaa..2ba43ae84b20f993ba175f728297cf5360066872 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -56,7 +56,7 @@ static int sha_eq(const unsigned char *a, const unsigned char *b)
 {
        if (!a && !b)
                return 2;
-       return a && b && memcmp(a, b, 20) == 0;
+       return a && b && hashcmp(a, b) == 0;
 }
 
 /*
@@ -158,7 +158,7 @@ static struct cache_entry *make_cache_entry(unsigned int mode,
        size = cache_entry_size(len);
        ce = xcalloc(1, size);
 
-       memcpy(ce->sha1, sha1, 20);
+       hashcpy(ce->sha1, sha1);
        memcpy(ce->name, path, len);
        ce->ce_flags = create_ce_flags(len, stage);
        ce->ce_mode = create_ce_mode(mode);
@@ -283,7 +283,7 @@ static int save_files_dirs(const unsigned char *sha1,
                unsigned int mode, int stage)
 {
        int len = strlen(path);
-       char *newpath = malloc(baselen + len + 1);
+       char *newpath = xmalloc(baselen + len + 1);
        memcpy(newpath, base, baselen);
        memcpy(newpath + baselen, path, len);
        newpath[baselen + len] = '\0';
@@ -355,7 +355,7 @@ static struct path_list *get_unmerged(void)
                }
                e = item->util;
                e->stages[ce_stage(ce)].mode = ntohl(ce->ce_mode);
-               memcpy(e->stages[ce_stage(ce)].sha, ce->sha1, 20);
+               hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
        }
 
        return unmerged;
@@ -455,7 +455,7 @@ static int remove_path(const char *name)
        if (ret)
                return ret;
        len = strlen(name);
-       dirs = malloc(len+1);
+       dirs = xmalloc(len+1);
        memcpy(dirs, name, len);
        dirs[len] = '\0';
        while ((slash = strrchr(name, '/'))) {
@@ -513,8 +513,8 @@ static char *unique_path(const char *path, const char *branch)
 
 static int mkdir_p(const char *path, unsigned long mode)
 {
-       /* path points to cache entries, so strdup before messing with it */
-       char *buf = strdup(path);
+       /* path points to cache entries, so xstrdup before messing with it */
+       char *buf = xstrdup(path);
        int result = safe_create_leading_directories(buf);
        free(buf);
        return result;
@@ -572,7 +572,7 @@ void update_file_flags(const unsigned char *sha,
                        flush_buffer(fd, buf, size);
                        close(fd);
                } else if (S_ISLNK(mode)) {
-                       char *lnk = malloc(size + 1);
+                       char *lnk = xmalloc(size + 1);
                        memcpy(lnk, buf, size);
                        lnk[size] = '\0';
                        mkdir_p(path, 0777);
@@ -636,10 +636,10 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
                result.clean = 0;
                if (S_ISREG(a->mode)) {
                        result.mode = a->mode;
-                       memcpy(result.sha, a->sha1, 20);
+                       hashcpy(result.sha, a->sha1);
                } else {
                        result.mode = b->mode;
-                       memcpy(result.sha, b->sha1, 20);
+                       hashcpy(result.sha, b->sha1);
                }
        } else {
                if (!sha_eq(a->sha1, o->sha1) && !sha_eq(b->sha1, o->sha1))
@@ -648,9 +648,9 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
                result.mode = a->mode == o->mode ? b->mode: a->mode;
 
                if (sha_eq(a->sha1, o->sha1))
-                       memcpy(result.sha, b->sha1, 20);
+                       hashcpy(result.sha, b->sha1);
                else if (sha_eq(b->sha1, o->sha1))
-                       memcpy(result.sha, a->sha1, 20);
+                       hashcpy(result.sha, a->sha1);
                else if (S_ISREG(a->mode)) {
                        int code = 1, fd;
                        struct stat st;
@@ -668,9 +668,9 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
                        git_unpack_file(a->sha1, src1);
                        git_unpack_file(b->sha1, src2);
 
-                       argv[2] = la = strdup(mkpath("%s/%s", branch1, a->path));
-                       argv[6] = lb = strdup(mkpath("%s/%s", branch2, b->path));
-                       argv[4] = lo = strdup(mkpath("orig/%s", o->path));
+                       argv[2] = la = xstrdup(mkpath("%s/%s", branch1, a->path));
+                       argv[6] = lb = xstrdup(mkpath("%s/%s", branch2, b->path));
+                       argv[4] = lo = xstrdup(mkpath("orig/%s", o->path));
                        argv[7] = src1;
                        argv[8] = orig;
                        argv[9] = src2,
@@ -699,7 +699,7 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
                        if (!(S_ISLNK(a->mode) || S_ISLNK(b->mode)))
                                die("cannot merge modes?");
 
-                       memcpy(result.sha, a->sha1, 20);
+                       hashcpy(result.sha, a->sha1);
 
                        if (!sha_eq(a->sha1, b->sha1))
                                result.clean = 0;
@@ -891,11 +891,9 @@ static int process_renames(struct path_list *a_renames,
 
                        remove_file(1, ren1_src);
 
-                       memcpy(src_other.sha1,
-                                       ren1->src_entry->stages[stage].sha, 20);
+                       hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
                        src_other.mode = ren1->src_entry->stages[stage].mode;
-                       memcpy(dst_other.sha1,
-                                       ren1->dst_entry->stages[stage].sha, 20);
+                       hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
                        dst_other.mode = ren1->dst_entry->stages[stage].mode;
 
                        try_merge = 0;
@@ -980,7 +978,7 @@ static int process_renames(struct path_list *a_renames,
 
 static unsigned char *has_sha(const unsigned char *sha)
 {
-       return memcmp(sha, null_sha1, 20) == 0 ? NULL: (unsigned char *)sha;
+       return is_null_sha1(sha) ? NULL: (unsigned char *)sha;
 }
 
 /* Per entry merge function */
@@ -1096,11 +1094,11 @@ static int process_entry(const char *path, struct stage_data *entry,
 
                output("Auto-merging %s", path);
                o.path = a.path = b.path = (char *)path;
-               memcpy(o.sha1, o_sha, 20);
+               hashcpy(o.sha1, o_sha);
                o.mode = o_mode;
-               memcpy(a.sha1, a_sha, 20);
+               hashcpy(a.sha1, a_sha);
                a.mode = a_mode;
-               memcpy(b.sha1, b_sha, 20);
+               hashcpy(b.sha1, b_sha);
                b.mode = b_mode;
 
                mfi = merge_file(&o, &a, &b,
@@ -1237,13 +1235,10 @@ int merge(struct commit *h1,
        if (merged_common_ancestors == NULL) {
                /* if there is no common ancestor, make an empty tree */
                struct tree *tree = xcalloc(1, sizeof(struct tree));
-               unsigned char hdr[40];
-               int hdrlen;
 
                tree->object.parsed = 1;
                tree->object.type = OBJ_TREE;
-               write_sha1_file_prepare(NULL, 0, tree_type, tree->object.sha1,
-                                       hdr, &hdrlen);
+               hash_sha1_file(NULL, 0, tree_type, tree->object.sha1);
                merged_common_ancestors = make_virtual_commit(tree, "ancestor");
        }
 
@@ -1316,9 +1311,9 @@ int main(int argc, char *argv[])
        original_index_file = getenv("GIT_INDEX_FILE");
 
        if (!original_index_file)
-               original_index_file = strdup(git_path("index"));
+               original_index_file = xstrdup(git_path("index"));
 
-       temporary_index_file = strdup(git_path("mrg-rcrsv-tmp-idx"));
+       temporary_index_file = xstrdup(git_path("mrg-rcrsv-tmp-idx"));
 
        if (argc < 4)
                die("Usage: %s <base>... -- <head> <remote> ...\n", argv[0]);