Commit Diff


commit - 47fc753bba73bc055d68300409fa9bc6985c19ba3e92e90ad94c06ec0a240902
commit + d6b5af4a568fa12a795821b40b8c3c80350cfd9d53754be1527bff020d350b4e
blob - 184e5fc63ffb65104e0e401b9aaa8d251cebfe3c6a48daa65c5b6a8242e3f205
blob + 480f5328fc1e9156e8e7bbeb7add0cf4b7b76fea8916810cfcf3591b98255cd5
--- lib/worktree.c	
+++ lib/worktree.c	
@@ -6111,7 +6111,7 @@ insert_tree_entry(struct got_tree_entry *new_te,
 	if (err)
 		return err;
 	if (new_pe == NULL)
-		return got_error(GOT_ERR_TREE_DUP_ENTRY);
+		return got_error_path(new_te->name, GOT_ERR_TREE_DUP_ENTRY);
 	return NULL;
 }
 
@@ -6868,7 +6868,6 @@ got_worktree_commit(struct got_object_id **new_commit_
 		    head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
 		if (err)
 			goto done;
-
 	}
 
 	err = commit_worktree(new_commit_id, &commitable_paths,