rebase: consolidate clean-up code before leaving reset_head()

diff --git a/commit-reach.h b/commit-reach.h
index 7d313e2975a28ef79b2ccf6dea965d4f139eda58..7a65f55e59fd724fb351055b67a8c87a86a35c7c 100644 (file)
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -1,12 +1,13 @@
-#ifndef __COMMIT_REACH_H__
-#define __COMMIT_REACH_H__
+#ifndef COMMIT_REACH_H
+#define COMMIT_REACH_H
 
+#include "commit.h"
 #include "commit-slab.h"
 
-struct commit;
 struct commit_list;
-struct contains_cache;
 struct ref_filter;
+struct object_id;
+struct object_array;
 
 struct commit_list *get_merge_bases_many(struct commit *one,
                                         int n,