commit 678ade17323ba52d28ca9b2b58dfe8a232958363
from: Stefan Sperling <stsp@stsp.name>
date: Sun Mar 22 15:44:34 2020 UTC

don't error out if rebase sees no merged paths; elide the commit instead

commit - ba580f687cd7280a6d7bffb1693077693c486056
commit + 678ade17323ba52d28ca9b2b58dfe8a232958363
blob - dd38ef5eac3a25d0396293542c1569e376556118
blob + 8438cb9700eb8696249c22aec54bfa6249f98bc5
--- include/got_error.h
+++ include/got_error.h
@@ -113,7 +113,7 @@
 #define GOT_ERR_HISTEDIT_BUSY	96
 #define GOT_ERR_HISTEDIT_CMD	97
 #define GOT_ERR_HISTEDIT_PATH	98
-#define GOT_ERR_NO_MERGED_PATHS 99
+/* 99 is currently unused */
 #define GOT_ERR_COMMIT_BRANCH	100
 #define GOT_ERR_FILE_STAGED	101
 #define GOT_ERR_STAGE_NO_CHANGE	102
@@ -253,7 +253,7 @@ static const struct got_error {
 	{ GOT_ERR_HISTEDIT_CMD, "bad histedit command" },
 	{ GOT_ERR_HISTEDIT_PATH, "cannot edit branch history which contains "
 	    "changes outside of this work tree's path prefix" },
-	{ GOT_ERR_NO_MERGED_PATHS, "empty list of merged paths" },
+	{ 99, "unused error code" },
 	{ GOT_ERR_COMMIT_BRANCH, "will not commit to a branch outside the "
 	    "\"refs/heads/\" reference namespace" },
 	{ GOT_ERR_FILE_STAGED, "file is staged" },
blob - f43056690320ca4d0531a3f1ae2b4550a70b31db
blob + b4197e4d8c33edc1a60f7d33a519c558ed3726a8
--- lib/worktree.c
+++ lib/worktree.c
@@ -5187,10 +5187,6 @@ rebase_commit(struct got_object_id **new_commit_id,
 	 */
 	if (merged_paths) {
 		struct got_pathlist_entry *pe;
-		if (TAILQ_EMPTY(merged_paths)) {
-			err = got_error(GOT_ERR_NO_MERGED_PATHS);
-			goto done;
-		}
 		TAILQ_FOREACH(pe, merged_paths, entry) {
 			err = worktree_status(worktree, pe->path, fileindex,
 			    repo, collect_commitables, &cc_arg, NULL, NULL, 0,