Commit Diff


commit - 909d120e02559eff42cb73dc284653b57b541660
commit + f66c734c57ba39774198d381b7f9a27cfdd30abe
blob - 9fc13a8a995147ee68196593283d8688f160f5e4
blob + aa70f135407e9e199d67455d25fd5c272fd51cee
--- lib/worktree.c
+++ lib/worktree.c
@@ -3879,6 +3879,8 @@ write_tree(struct got_object_id **new_tree_id,
 
 			err = match_deleted_or_modified_ct(&ct, te,
 			    path_base_tree, commitable_paths);
+			if (err)
+				goto done;
 			if (ct) {
 				/* NB: Deleted entries get dropped here. */
 				if (ct->status == GOT_STATUS_MODIFY ||