commit 6d1e5fdc3f135929f40d4a92a6a4b8bc0f0a61e5
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas.adam22@gmail.com>
date: Thu Apr 25 14:57:52 2024 UTC

rename a function to avoid gramatical ambiguity

commit - d9dd1b289c149184c4da042edfb9dae1062c4187
commit + 6d1e5fdc3f135929f40d4a92a6a4b8bc0f0a61e5
blob - 31c07cd69ecc36c386c0a308d3eb11e9739a64b5
blob + f784cc2785cf56da4f06a59cf3e4dfe590b448f7
--- got/got.c
+++ got/got.c
@@ -8029,7 +8029,7 @@ add_progress(void *arg, unsigned char status, const ch
 }
 
 static const struct got_error *
-check_paths_contains_dir(int *contains_dir, struct got_worktree *worktree,
+pathlist_contains_directory(int *contains_dir, struct got_worktree *worktree,
     struct got_pathlist_head *paths)
 {
 	const struct got_error *error = NULL;
@@ -8135,7 +8135,8 @@ cmd_add(int argc, char *argv[])
 		goto done;
 
 	if (!can_recurse) {
-		error = check_paths_contains_dir(&contains_dir, worktree, &paths);
+		error = pathlist_contains_directory(&contains_dir, worktree,
+		    &paths);
 		if (error != NULL)
 			goto done;
 
@@ -8282,7 +8283,8 @@ cmd_remove(int argc, char *argv[])
 		goto done;
 
 	if (!can_recurse) {
-		error = check_paths_contains_dir(&contains_dir, worktree, &paths);
+		error = pathlist_contains_directory(&contains_dir, worktree,
+		    &paths);
 		if (error != NULL)
 			goto done;
 
@@ -8996,7 +8998,8 @@ cmd_revert(int argc, char *argv[])
 		goto done;
 
 	if (!can_recurse) {
-		error = check_paths_contains_dir(&contains_dir, worktree, &paths);
+		error = pathlist_contains_directory(&contains_dir, worktree,
+		    &paths);
 		if (error != NULL)
 			goto done;
 
@@ -13923,7 +13926,7 @@ cmd_stage(int argc, char *argv[])
 		    print_stage, NULL, check_cancelled, NULL);
 	else {
 		if (!can_recurse) {
-			error = check_paths_contains_dir(&contains_dir,
+			error = pathlist_contains_directory(&contains_dir,
 			    worktree, &paths);
 			if (error != NULL)
 				goto done;
@@ -14059,7 +14062,7 @@ cmd_unstage(int argc, char *argv[])
 		goto done;
 
 	if (!can_recurse) {
-		error = check_paths_contains_dir(&contains_dir,
+		error = pathlist_contains_directory(&contains_dir,
 		    worktree, &paths);
 		if (error != NULL)
 			goto done;