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

diff --git a/builtin/prune.c b/builtin/prune.c
index 70ec35aa0582386d233b4d49d4bbdbb9cef985cb..72b0621b7683e4c7b8efced044b831bf9ebc1941 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -40,7 +40,7 @@ static int prune_object(const struct object_id *oid, const char *fullpath,
         * Do we know about this object?
         * It must have been reachable
         */
-       if (lookup_object(oid->hash))
+       if (lookup_object(the_repository, oid->hash))
                return 0;
 
        if (lstat(fullpath, &st)) {