Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object

diff --git a/pretty.c b/pretty.c
index 587d48371b05e0298e3358fa46bfaa4232ae24f9..9c9f81b5b0e0560e05da3ec3fa62c05eae92d1e3 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "config.h"
 #include "commit.h"
 #include "utf8.h"
 #include "diff.h"
@@ -1137,7 +1138,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 
        /* these depend on the commit */
        if (!commit->object.parsed)
-               parse_object(commit->object.oid.hash);
+               parse_object(&commit->object.oid);
 
        switch (placeholder[0]) {
        case 'H':               /* commit hash */