tests: allow user to specify trash directory location

diff --git a/commit.c b/commit.c
index 8f6b703c557599921d890c3b50b66eaa397de548..e2bcbe814936989e7a86018e46ed6ca86f4c1f10 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -50,7 +50,6 @@ struct commit *lookup_commit(const unsigned char *sha1)
 
 static unsigned long parse_commit_date(const char *buf, const char *tail)
 {
-       unsigned long date;
        const char *dateptr;
 
        if (buf + 6 >= tail)
@@ -73,10 +72,7 @@ static unsigned long parse_commit_date(const char *buf, const char *tail)
        if (buf >= tail)
                return 0;
        /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
-       date = strtoul(dateptr, NULL, 10);
-       if (date == ULONG_MAX)
-               date = 0;
-       return date;
+       return strtoul(dateptr, NULL, 10);
 }
 
 static struct commit_graft **commit_graft;
@@ -266,7 +262,11 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
                    bufptr[47] != '\n')
                        return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
                bufptr += 48;
-               if (graft)
+               /*
+                * The clone is shallow if nr_parent < 0, and we must
+                * not traverse its real parents even when we unhide them.
+                */
+               if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
                        continue;
                new_parent = lookup_commit(parent);
                if (new_parent)
@@ -316,26 +316,6 @@ int parse_commit(struct commit *item)
        return ret;
 }
 
-static void unparse_commit_list(struct commit_list *list)
-{
-       for (; list; list = list->next)
-               unparse_commit(list->item);
-}
-
-void unparse_commit(struct commit *item)
-{
-       item->object.flags = 0;
-       item->object.used = 0;
-       if (item->object.parsed) {
-               item->object.parsed = 0;
-               if (item->parents) {
-                       unparse_commit_list(item->parents);
-                       free_commit_list(item->parents);
-                       item->parents = NULL;
-               }
-       }
-}
-
 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
 {
        struct commit_list *new_list = xmalloc(sizeof(struct commit_list));