commit - 36fdf003886958dce2c912acd082b3e9cfe88979
commit + ef85a376d8f41068fa9c6b11bc1fff98e3e9520c
blob - 1ddae629403bfde95bf140e94d9200fc28961163
blob + 29a58f762f6daee7971bdeac8f303124c5d6f1f2
--- got/got.c
+++ got/got.c
@@ -10426,13 +10426,12 @@ done:
 
 static const struct got_error *
 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
-    struct got_reference *branch, struct got_reference *new_base_branch,
-    struct got_reference *tmp_branch, struct got_repository *repo,
-    int create_backup)
+    struct got_reference *branch, struct got_reference *tmp_branch,
+    struct got_repository *repo, int create_backup)
 {
 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
 	return got_worktree_rebase_complete(worktree, fileindex,
-	    new_base_branch, tmp_branch, branch, repo, create_backup);
+	    tmp_branch, branch, repo, create_backup);
 }
 
 static const struct got_error *
@@ -11249,8 +11248,7 @@ cmd_rebase(int argc, char *argv[])
 	if (STAILQ_EMPTY(&commits)) {
 		if (continue_rebase) {
 			error = rebase_complete(worktree, fileindex,
-			    branch, new_base_branch, tmp_branch, repo,
-			    create_backup);
+			    branch, tmp_branch, repo, create_backup);
 			goto done;
 		} else {
 			/* Fast-forward the reference of the branch. */
@@ -11335,7 +11333,7 @@ cmd_rebase(int argc, char *argv[])
 		}
 	} else
 		error = rebase_complete(worktree, fileindex, branch,
-		    new_base_branch, tmp_branch, repo, create_backup);
+		    tmp_branch, repo, create_backup);
 done:
 	free(cwd);
 	free(committer);
blob - 444d64fb9897a4e6ab7664069d364358ec7bfacb
blob + 4ea02aaea560daeba058d4b8541f5ea222eb7586
--- include/got_worktree.h
+++ include/got_worktree.h
@@ -332,7 +332,7 @@ const struct got_error *got_worktree_rebase_postpone(s
  */
 const struct got_error *got_worktree_rebase_complete(struct got_worktree *,
     struct got_fileindex *, struct got_reference *, struct got_reference *,
-    struct got_reference *, struct got_repository *, int create_backup);
+    struct got_repository *, int create_backup);
 
 /*
  * Abort the current rebase operation.
blob - 158fcd73c1c9600a23bfabea6968f055ea3e6f0f
blob + 463be5bf1c6d96c601149d660c3857be5d14931d
--- lib/worktree.c
+++ lib/worktree.c
@@ -7016,9 +7016,9 @@ done:
 
 const struct got_error *
 got_worktree_rebase_complete(struct got_worktree *worktree,
-    struct got_fileindex *fileindex, struct got_reference *new_base_branch,
-    struct got_reference *tmp_branch, struct got_reference *rebased_branch,
-    struct got_repository *repo, int create_backup)
+    struct got_fileindex *fileindex, struct got_reference *tmp_branch,
+    struct got_reference *rebased_branch, struct got_repository *repo,
+    int create_backup)
 {
 	const struct got_error *err, *unlockerr, *sync_err;
 	struct got_object_id *new_head_commit_id = NULL;