add a force_object_loose() function

This is meant to force the creation of a loose object even if it
already exists packed.  Needed for the next commit.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 7fb8f3359dddbb8f93aa827947c3e5d9de04f639..dcc7e988255174085e14f94393cd07c793929695 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -506,6 +506,7 @@ extern void * read_sha1_file(const unsigned char *sha1, enum object_type *type,
 extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
 extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
 extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
 extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
 extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
 extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);

+extern int force_object_loose(const unsigned char *sha1, time_t mtime);

 
 extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
 
 
 extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
 

diff --git a/sha1_file.c b/sha1_file.c
index 3516777bc7614c23da02dd7a9aa28a48294d56cb..141f5a713a2e542c0bcccbfa57b0dccc3142f362 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2102,26 +2102,16 @@ int hash_sha1_file(const void *buf, unsigned long len, const char *type,
        return 0;
 }
 
        return 0;
 }
 

-int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *returnsha1)
+static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
+                             void *buf, unsigned long len, time_t mtime)

 {
 {

-       int size, ret;
+       int fd, size, ret;

        unsigned char *compressed;
        z_stream stream;
        unsigned char *compressed;
        z_stream stream;

-       unsigned char sha1[20];

        char *filename;
        static char tmpfile[PATH_MAX];
        char *filename;
        static char tmpfile[PATH_MAX];

-       char hdr[32];
-       int fd, hdrlen;

 
 

-       /* Normally if we have it in the pack then we do not bother writing
-        * it out into .git/objects/??/?{38} file.
-        */
-       write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen);

        filename = sha1_file_name(sha1);
        filename = sha1_file_name(sha1);

-       if (returnsha1)
-               hashcpy(returnsha1, sha1);
-       if (has_sha1_file(sha1))
-               return 0;

        fd = open(filename, O_RDONLY);
        if (fd >= 0) {
                /*
        fd = open(filename, O_RDONLY);
        if (fd >= 0) {
                /*


@@ -2182,9 +2172,53 @@ int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned cha
                die("unable to write sha1 file");
        free(compressed);
 
                die("unable to write sha1 file");
        free(compressed);
 

+       if (mtime) {
+               struct utimbuf utb;
+               utb.actime = mtime;
+               utb.modtime = mtime;
+               if (utime(tmpfile, &utb) < 0)
+                       warning("failed utime() on %s: %s",
+                               tmpfile, strerror(errno));
+       }
+

        return move_temp_to_file(tmpfile, filename);
 }
 
        return move_temp_to_file(tmpfile, filename);
 }
 

+int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *returnsha1)
+{
+       unsigned char sha1[20];
+       char hdr[32];
+       int hdrlen;
+
+       /* Normally if we have it in the pack then we do not bother writing
+        * it out into .git/objects/??/?{38} file.
+        */
+       write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen);
+       if (returnsha1)
+               hashcpy(returnsha1, sha1);
+       if (has_sha1_file(sha1))
+               return 0;
+       return write_loose_object(sha1, hdr, hdrlen, buf, len, 0);
+}
+
+int force_object_loose(const unsigned char *sha1, time_t mtime)
+{
+       struct stat st;
+       void *buf;
+       unsigned long len;
+       enum object_type type;
+       char hdr[32];
+       int hdrlen;
+
+       if (find_sha1_file(sha1, &st))
+               return 0;
+       buf = read_packed_sha1(sha1, &type, &len);
+       if (!buf)
+               return error("cannot read sha1_file for %s", sha1_to_hex(sha1));
+       hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1;
+       return write_loose_object(sha1, hdr, hdrlen, buf, len, mtime);
+}
+

 /*
  * We need to unpack and recompress the object for writing
  * it out to a different file.
 /*
  * We need to unpack and recompress the object for writing
  * it out to a different file.