object-name.h: move declarations for object-name.c functions from cache.h

[thirdparty/git.git] / rebase-interactive.c

diff --git a/rebase-interactive.c b/rebase-interactive.c
index 7407c593191679c757573e567a28f35c65c9cb33..48467a7bc4a9246af273e94f7cc8ba1a4c7a2b05 100644 (file)
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -1,11 +1,15 @@
 #include "cache.h"
 #include "commit.h"
+#include "environment.h"
+#include "gettext.h"
 #include "sequencer.h"
 #include "rebase-interactive.h"
 #include "strbuf.h"
 #include "commit-slab.h"
 #include "config.h"
 #include "dir.h"
+#include "object-name.h"
+#include "wrapper.h"
 
 static const char edit_todo_list_advice[] =
 N_("You can fix this with 'git rebase --edit-todo' "
@@ -187,7 +191,7 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo)
                struct commit *commit = item->commit;
                if (commit && !*commit_seen_at(&commit_seen, commit)) {
                        strbuf_addf(&missing, " - %s %.*s\n",
-                                   find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV),
+                                   repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV),
                                    item->arg_len,
                                    todo_item_get_arg(old_todo, item));
                        *commit_seen_at(&commit_seen, commit) = 1;