Add git-am, applymbox replacement.

[git.git] / sha1_file.c

diff --git a/sha1_file.c b/sha1_file.c
index 6638202..287f618 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -20,6 +20,8 @@
 #endif
 #endif
 
+const unsigned char null_sha1[20] = { 0, };
+
 static unsigned int sha1_file_open_flag = O_NOATIME;
 
 static unsigned hexval(char c)
@@ -70,6 +72,13 @@ static void setup_git_env(void)
                git_graft_file = strdup(git_path("info/grafts"));
 }
 
+char *get_git_dir(void)
+{
+       if (!git_dir)
+               setup_git_env();
+       return git_dir;
+}
+
 char *get_object_directory(void)
 {
        if (!git_object_dir)
@@ -864,7 +873,8 @@ void packed_object_info_detail(struct pack_entry *e,
                strcpy(type, "tag");
                break;
        default:
-               die("corrupted pack file");
+               die("corrupted pack file %s containing object of kind %d",
+                   p->pack_name, kind);
        }
        *store_size = 0; /* notyet */
 }
@@ -903,7 +913,8 @@ static int packed_object_info(struct pack_entry *entry,
                strcpy(type, "tag");
                break;
        default:
-               die("corrupted pack file");
+               die("corrupted pack file %s containing object of kind %d",
+                   p->pack_name, kind);
        }
        if (sizep)
                *sizep = size;
@@ -1003,7 +1014,7 @@ static void *unpack_entry(struct pack_entry *entry,
        retval = unpack_entry_gently(entry, type, sizep);
        unuse_packed_git(p);
        if (!retval)
-               die("corrupted pack file");
+               die("corrupted pack file %s", p->pack_name);
        return retval;
 }
 
@@ -1534,3 +1545,42 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, con
                munmap(buf, size);
        return ret;
 }
+
+int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object)
+{
+       int fd;
+       char *target;
+
+       switch (st->st_mode & S_IFMT) {
+       case S_IFREG:
+               fd = open(path, O_RDONLY);
+               if (fd < 0)
+                       return error("open(\"%s\"): %s", path,
+                                    strerror(errno));
+               if (index_fd(sha1, fd, st, write_object, NULL) < 0)
+                       return error("%s: failed to insert into database",
+                                    path);
+               break;
+       case S_IFLNK:
+               target = xmalloc(st->st_size+1);
+               if (readlink(path, target, st->st_size+1) != st->st_size) {
+                       char *errstr = strerror(errno);
+                       free(target);
+                       return error("readlink(\"%s\"): %s", path,
+                                    errstr);
+               }
+               if (!write_object) {
+                       unsigned char hdr[50];
+                       int hdrlen;
+                       write_sha1_file_prepare(target, st->st_size, "blob",
+                                               sha1, hdr, &hdrlen);
+               } else if (write_sha1_file(target, st->st_size, "blob", sha1))
+                       return error("%s: failed to insert into database",
+                                    path);
+               free(target);
+               break;
+       default:
+               return error("%s: unsupported file type", path);
+       }
+       return 0;
+}