Merge branch 'jc/git-log-doc'

diff --git a/shallow.c b/shallow.c
index 2db1dc428f80bb4e28ca5a059720433d12131d4a..dbd9f5ad0ac21e70fc3a095d8e2938f245c238d3 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -17,7 +17,7 @@ int register_shallow(const unsigned char *sha1)
        return register_commit_graft(graft, 0);
 }
 
-int is_repository_shallow()
+int is_repository_shallow(void)
 {
        FILE *fp;
        char buf[1024];
@@ -60,7 +60,9 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
                                        commit = NULL;
                                        continue;
                                }
-                               commit->util = xcalloc(1, sizeof(int));
+                               if (!commit->util)
+                                       commit->util = xmalloc(sizeof(int));
+                               *(int *)commit->util = 0;
                                cur_depth = 0;
                        } else {
                                commit = (struct commit *)
@@ -99,4 +101,3 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
 
        return result;
 }
-