Merge branch 'ma/regex-no-regfree-after-comp-fail'

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 2e24b5c330e8eb17a8755e9b47fa3c66810981d3..6c2148b71db593af1a4ef8d2d1bdbdfe16661851 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 #include "config.h"
-#include "commit.h"
+#include "pretty.h"
 #include "refs.h"
 #include "builtin.h"
 #include "color.h"
@@ -292,7 +292,7 @@ static void show_one_commit(struct commit *commit, int no_name)
                }
                else
                        printf("[%s] ",
-                              find_unique_abbrev(commit->object.oid.hash,
+                              find_unique_abbrev(&commit->object.oid,
                                                  DEFAULT_ABBREV));
        }
        puts(pretty_str);