Make "git tag" create both simple and signed tags

diff --git a/convert-cache.c b/convert-cache.c
index 431b11798816a88c78daa846fdebf41ed57f1378..ee599f1c027fc829ab98a3ba489a5c4bfd7e9977 100644 (file)
--- a/convert-cache.c
+++ b/convert-cache.c
@@ -18,8 +18,7 @@ static struct entry * convert_entry(unsigned char *sha1);
 
 static struct entry *insert_new(unsigned char *sha1, int pos)
 {
-       struct entry *new = malloc(sizeof(struct entry));
-
+       struct entry *new = xmalloc(sizeof(struct entry));
        memset(new, 0, sizeof(*new));
        memcpy(new->old_sha1, sha1, 20);
        memmove(convert + pos + 1, convert + pos, (nr_convert - pos) * sizeof(struct entry *));
@@ -66,25 +65,11 @@ static void convert_ascii_sha1(void *buffer)
        memcpy(buffer, sha1_to_hex(entry->new_sha1), 40);
 }
 
-#define ORIG_OFFSET (40)
-
-static int prepend_integer(char *buffer, unsigned val, int i)
-{
-       buffer[--i] = '\0';
-       do {
-               buffer[--i] = '0' + (val % 10);
-               val /= 10;
-       } while (val);
-       return i;
-}
-
-
 static int write_subdirectory(void *buffer, unsigned long size, const char *base, int baselen, unsigned char *result_sha1)
 {
-       char *new = malloc(size + ORIG_OFFSET);
-       unsigned long newlen = ORIG_OFFSET;
+       char *new = xmalloc(size);
+       unsigned long newlen = 0;
        unsigned long used;
-       int i;
 
        used = 0;
        while (size) {
@@ -114,7 +99,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
                        continue;
                }
 
-               newlen += sprintf(new + newlen, "%o %.*s", S_IFDIR, slash - path, path);
+               newlen += sprintf(new + newlen, "%o %.*s", S_IFDIR, (int)(slash - path), path);
                new[newlen++] = 0;
                sha1 = (unsigned char *)(new + newlen);
                newlen += 20;
@@ -126,15 +111,39 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
                buffer += len;
        }
 
-       i = prepend_integer(new, newlen - ORIG_OFFSET, ORIG_OFFSET);
-       i -= 5;
-       memcpy(new + i, "tree ", 5);
-
-       write_sha1_file(new + i, newlen - i, result_sha1);
+       write_sha1_file(new, newlen, "tree", result_sha1);
        free(new);
        return used;
 }
 
+static int convert_mode(char *buffer)
+{
+       char *end;
+       unsigned short mode = strtoul(buffer, &end, 8);
+       unsigned short newmode;
+       char num[10];
+       int len;
+
+       if (*end != ' ')
+               die("corrupt tree object");
+       switch (mode) {
+       case S_IFREG | 0644:
+       case S_IFREG | 0755:
+       case S_IFLNK:
+       case S_IFDIR:
+               return 0;
+       }
+       newmode = 0;
+       if (S_ISREG(mode))
+               newmode = (mode & 0100) ? 0755 : 0644;
+       newmode |= mode & S_IFMT;
+       len = sprintf(num, "%o", newmode);
+       if (len != end - buffer)
+               return error("unable to convert tree entry mode %o to %o", mode, newmode);
+       memcpy(buffer, num, len);
+       return 0;
+}
+
 static void convert_tree(void *buffer, unsigned long size, unsigned char *result_sha1)
 {
        void *orig_buffer = buffer;
@@ -143,6 +152,7 @@ static void convert_tree(void *buffer, unsigned long size, unsigned char *result
        while (size) {
                int len = 1+strlen(buffer);
 
+               convert_mode(buffer);
                convert_binary_sha1(buffer + len);
 
                len += 20;
@@ -244,10 +254,9 @@ static int convert_date_line(char *dst, void **buf, unsigned long *sp)
 
 static void convert_date(void *buffer, unsigned long size, unsigned char *result_sha1)
 {
-       char *new = malloc(size + ORIG_OFFSET + 100);
-       unsigned long newlen = ORIG_OFFSET;
-       int i;
-
+       char *new = xmalloc(size + 100);
+       unsigned long newlen = 0;
+       
        // "tree <sha1>\n"
        memcpy(new + newlen, buffer, 46);
        newlen += 46;
@@ -271,11 +280,7 @@ static void convert_date(void *buffer, unsigned long size, unsigned char *result
        memcpy(new + newlen, buffer, size);
        newlen += size;
 
-       i = prepend_integer(new, newlen - ORIG_OFFSET, ORIG_OFFSET);
-       i -= 7;
-       memcpy(new + i, "commit ", 7);
-
-       write_sha1_file(new + i, newlen - i, result_sha1);
+       write_sha1_file(new, newlen, "commit", result_sha1);
        free(new);      
 }
 
@@ -298,7 +303,7 @@ static struct entry * convert_entry(unsigned char *sha1)
        struct entry *entry = lookup_entry(sha1);
        char type[20];
        void *buffer, *data;
-       unsigned long size, offset;
+       unsigned long size;
 
        if (entry->converted)
                return entry;
@@ -306,16 +311,15 @@ static struct entry * convert_entry(unsigned char *sha1)
        if (!data)
                die("unable to read object %s", sha1_to_hex(sha1));
 
-       buffer = malloc(size + 100);
-       offset = sprintf(buffer, "%s %lu", type, size)+1;
-       memcpy(buffer + offset, data, size);
+       buffer = xmalloc(size);
+       memcpy(buffer, data, size);
        
        if (!strcmp(type, "blob")) {
-               write_sha1_file(buffer, size + offset, entry->new_sha1);
+               write_sha1_file(buffer, size, "blob", entry->new_sha1);
        } else if (!strcmp(type, "tree"))
-               convert_tree(buffer + offset, size, entry->new_sha1);
+               convert_tree(buffer, size, entry->new_sha1);
        else if (!strcmp(type, "commit"))
-               convert_commit(buffer + offset, size, entry->new_sha1);
+               convert_commit(buffer, size, entry->new_sha1);
        else
                die("unknown object type '%s' in %s", type, sha1_to_hex(sha1));
        entry->converted = 1;
@@ -328,8 +332,8 @@ int main(int argc, char **argv)
        unsigned char sha1[20];
        struct entry *entry;
 
-       if (argc != 2 || get_sha1_hex(argv[1], sha1))
-               usage("convert-cache <sha1>");
+       if (argc != 2 || get_sha1(argv[1], sha1))
+               usage("git-convert-cache <sha1>");
 
        entry = convert_entry(sha1);
        printf("new sha1: %s\n", sha1_to_hex(entry->new_sha1));