Documentation/git-cherry-pick: Add --replay and --no-commit.

diff --git a/sha1_file.c b/sha1_file.c
index e45679975e7fcbfae0497f25ab56b6bbd0ff1155..111a71de6b3bb33b7e2ca1879613a70bc3a6ed81 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -51,6 +51,8 @@ int get_sha1_hex(const char *hex, unsigned char *sha1)
 int safe_create_leading_directories(char *path)
 {
        char *pos = path;
+       if (*pos == '/')
+               pos++;
 
        while (pos) {
                pos = strchr(pos, '/');
@@ -182,8 +184,8 @@ static struct alternate_object_database **alt_odb_tail;
  * alternate_object_database.  The elements on this list come from
  * non-empty elements from colon separated ALTERNATE_DB_ENVIRONMENT
  * environment variable, and $GIT_OBJECT_DIRECTORY/info/alternates,
- * whose contents is exactly in the same format as that environment
- * variable.  Its base points at a statically allocated buffer that
+ * whose contents is similar to that environment variable but can be
+ * LF separated.  Its base points at a statically allocated buffer that
  * contains "/the/directory/corresponding/to/.git/objects/...", while
  * its name points just after the slash at the end of ".git/objects/"
  * in the example above, and has enough space to hold 40-byte hex
@@ -195,6 +197,7 @@ static void link_alt_odb_entries(const char *alt, const char *ep, int sep,
 {
        const char *cp, *last;
        struct alternate_object_database *ent;
+       const char *objdir = get_object_directory();
        int base_len = -1;
 
        last = alt;
@@ -209,6 +212,7 @@ static void link_alt_odb_entries(const char *alt, const char *ep, int sep,
                for ( ; cp < ep && *cp != sep; cp++)
                        ;
                if (last != cp) {
+                       struct alternate_object_database *alt;
                        /* 43 = 40-byte + 2 '/' + terminating NUL */
                        int pfxlen = cp - last;
                        int entlen = pfxlen + 43;
@@ -221,9 +225,7 @@ static void link_alt_odb_entries(const char *alt, const char *ep, int sep,
                                pfxlen += base_len;
                        }
                        ent = xmalloc(sizeof(*ent) + entlen);
-                       *alt_odb_tail = ent;
-                       alt_odb_tail = &(ent->next);
-                       ent->next = NULL;
+
                        if (*last != '/' && relative_base) {
                                memcpy(ent->base, relative_base, base_len - 1);
                                ent->base[base_len - 1] = '/';
@@ -235,6 +237,22 @@ static void link_alt_odb_entries(const char *alt, const char *ep, int sep,
                        ent->name = ent->base + pfxlen + 1;
                        ent->base[pfxlen] = ent->base[pfxlen + 3] = '/';
                        ent->base[entlen-1] = 0;
+
+                       /* Prevent the common mistake of listing the same
+                        * thing twice, or object directory itself.
+                        */
+                       for (alt = alt_odb_list; alt; alt = alt->next)
+                               if (!memcmp(ent->base, alt->base, pfxlen))
+                                       goto bad;
+                       if (!memcmp(ent->base, objdir, pfxlen)) {
+                       bad:
+                               free(ent);
+                       }
+                       else {
+                               *alt_odb_tail = ent;
+                               alt_odb_tail = &(ent->next);
+                               ent->next = NULL;
+                       }
                }
                while (cp < ep && *cp == sep)
                        cp++;
@@ -422,6 +440,7 @@ struct packed_git *add_packed_git(char *path, int path_len, int local)
        struct packed_git *p;
        unsigned long idx_size;
        void *idx_map;
+       unsigned char sha1[20];
 
        if (check_packed_git_idx(path, &idx_size, &idx_map))
                return NULL;
@@ -445,6 +464,8 @@ struct packed_git *add_packed_git(char *path, int path_len, int local)
        p->pack_last_used = 0;
        p->pack_use_cnt = 0;
        p->pack_local = local;
+       if (!get_sha1_hex(path + path_len - 40 - 4, sha1))
+               memcpy(p->sha1, sha1, 20);
        return p;
 }
 
@@ -526,8 +547,9 @@ void prepare_packed_git(void)
        prepare_packed_git_one(get_object_directory(), 1);
        prepare_alt_odb();
        for (alt = alt_odb_list; alt; alt = alt->next) {
-               alt->name[0] = 0;
+               alt->name[-1] = 0;
                prepare_packed_git_one(alt->base, 0);
+               alt->name[-1] = '/';
        }
        run_once = 1;
 }
@@ -1232,18 +1254,22 @@ static int link_temp_to_file(const char *tmpfile, char *filename)
 int move_temp_to_file(const char *tmpfile, char *filename)
 {
        int ret = link_temp_to_file(tmpfile, filename);
-       if (ret) {
-               /*
-                * Coda hack - coda doesn't like cross-directory links,
-                * so we fall back to a rename, which will mean that it
-                * won't be able to check collisions, but that's not a
-                * big deal.
-                *
-                * When this succeeds, we just return 0. We have nothing
-                * left to unlink.
-                */
-               if (ret == EXDEV && !rename(tmpfile, filename))
+
+       /*
+        * Coda hack - coda doesn't like cross-directory links,
+        * so we fall back to a rename, which will mean that it
+        * won't be able to check collisions, but that's not a
+        * big deal.
+        *
+        * The same holds for FAT formatted media.
+        *
+        * When this succeeds, we just return 0. We have nothing
+        * left to unlink.
+        */
+       if (ret && ret != EEXIST) {
+               if (!rename(tmpfile, filename))
                        return 0;
+               ret = errno;
        }
        unlink(tmpfile);
        if (ret) {