builtin rebase: fast-forward to onto if it is a proper descendant

diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c
index 300eb59657e29cace38798029a9170834cac7c9e..58652229f273bf93e55b0ff5eef1421096cfe719 100644 (file)
--- a/builtin/unpack-file.c
+++ b/builtin/unpack-file.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "config.h"
+#include "object-store.h"
 
 static char *create_temp_file(struct object_id *oid)
 {