Merge branch 'tb/config-default'

diff --git a/sha1-file.c b/sha1-file.c
index 555e780f4b61b8b96b12549de341cb2d827e039e..de4839e634c02cb7497f05a3a4597b9fa5123e32 100644 (file)
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -610,7 +610,7 @@ void add_to_alternates_memory(const char *reference)
 /*
  * Compute the exact path an alternate is at and returns it. In case of
  * error NULL is returned and the human readable error is added to `err`
- * `path` may be relative and should point to $GITDIR.
+ * `path` may be relative and should point to $GIT_DIR.
  * `err` must not be null.
  */
 char *compute_alternate_path(const char *path, struct strbuf *err)
@@ -1801,7 +1801,7 @@ static void check_commit(const void *buf, size_t size)
 {
        struct commit c;
        memset(&c, 0, sizeof(c));
-       if (parse_commit_buffer(&c, buf, size))
+       if (parse_commit_buffer(&c, buf, size, 0))
                die("corrupt commit");
 }