diff --git a/src/fileops.c b/src/fileops.c
index 02f48e120..ae240fcd2 100644
--- a/src/fileops.c
+++ b/src/fileops.c
@@ -320,7 +320,7 @@ int git_futils_mkdir(
 	min_root_len = git_path_root(make_path.ptr);
 	if (root < min_root_len)
 		root = min_root_len;
-	while (make_path.ptr[root] == '/')
+	while (root >= 0 && make_path.ptr[root] == '/')
 		++root;
 
 	/* clip root to make_path length */
diff --git a/tests-clar/diff/rename.c b/tests-clar/diff/rename.c
index fd31a3859..224945e60 100644
--- a/tests-clar/diff/rename.c
+++ b/tests-clar/diff/rename.c
@@ -825,6 +825,8 @@ int test_names_expected(const git_diff_delta *delta, float progress, void *p)
 {
 	struct rename_expected *expected = p;
 
+	GIT_UNUSED(progress);
+
 	cl_assert(expected->idx < expected->len);
 
 	cl_assert_equal_i(delta->status, GIT_DELTA_RENAMED);