wildart
diff --git a/‎src/repository.c
Lines changed: 20 additions & 4 deletions b/‎src/repository.c
Lines changed: 20 additions & 4 deletions
diff --git a/‎tests/repo/reservedname.c
Lines changed: 24 additions & 0 deletions b/‎tests/repo/reservedname.c
Lines changed: 24 additions & 0 deletions
diff --git a/‎tests/resources/sub.git/HEAD
Lines changed: 1 addition & 0 deletions b/‎tests/resources/sub.git/HEAD
Lines changed: 1 addition & 0 deletions
diff --git a/‎tests/resources/sub.git/config
Lines changed: 8 additions & 0 deletions b/‎tests/resources/sub.git/config
Lines changed: 8 additions & 0 deletions
diff --git a/‎tests/resources/sub.git/index
405 Bytes b/‎tests/resources/sub.git/index
405 Bytes
diff --git a/‎tests/resources/sub.git/logs/HEAD
Lines changed: 1 addition & 0 deletions b/‎tests/resources/sub.git/logs/HEAD
Lines changed: 1 addition & 0 deletions
diff --git a/‎tests/resources/sub.git/logs/refs/heads/master
Lines changed: 1 addition & 0 deletions b/‎tests/resources/sub.git/logs/refs/heads/master
Lines changed: 1 addition & 0 deletions
diff --git a/‎tests/resources/sub.git/objects/10/ddd6d257e01349d514541981aeecea6b2e741d
22 Bytes b/‎tests/resources/sub.git/objects/10/ddd6d257e01349d514541981aeecea6b2e741d
22 Bytes
diff --git a/‎tests/resources/sub.git/objects/17/6a458f94e0ea5272ce67c36bf30b6be9caf623
28 Bytes b/‎tests/resources/sub.git/objects/17/6a458f94e0ea5272ce67c36bf30b6be9caf623
28 Bytes
diff --git a/‎tests/resources/sub.git/objects/94/c7d78d85c933d1d95b56bc2de01833ba8559fb
132 Bytes b/‎tests/resources/sub.git/objects/94/c7d78d85c933d1d95b56bc2de01833ba8559fb
132 Bytes
@@ -908,12 +908,28 @@ bool git_repository__reserved_names(
 			buf->size = git_repository__reserved_names_win32[i].size;
 		}
 
-		/* Try to add any repo-specific reserved names */
+		/* Try to add any repo-specific reserved names - the gitlink file
+		 * within a submodule or the repository (if the repository directory
+		 * is beneath the workdir).  These are typically `.git`, but should
+		 * be protected in case they are not.  Note, repo and workdir paths
+		 * are always prettified to end in `/`, so a prefixcmp is safe.
+		 */
 		if (!repo->is_bare) {
-			const char *reserved_path = repo->path_gitlink ?
-				repo->path_gitlink : repo->path_repository;
+			int (*prefixcmp)(const char *, const char *);
+			int error, ignorecase;
 
-			if (reserved_names_add8dot3(repo, reserved_path) < 0)
+			error = git_repository__cvar(
+				&ignorecase, repo, GIT_CVAR_IGNORECASE);
+			prefixcmp = (error || ignorecase) ? git__prefixcmp_icase :
+				git__prefixcmp;
+
+			if (repo->path_gitlink &&
+				reserved_names_add8dot3(repo, repo->path_gitlink) < 0)
+				goto on_error;
+
+			if (repo->path_repository &&
+				prefixcmp(repo->path_repository, repo->workdir) == 0 &&
+				reserved_names_add8dot3(repo, repo->path_repository) < 0)
 				goto on_error;
 		}
 	}
 
@@ -106,3 +106,27 @@ void test_repo_reservedname__submodule_pointer(void)
 	git_repository_free(sub_repo);
 #endif
 }
+
+/* Like the `submodule_pointer` test (above), this ensures that we do not
+ * follow the gitlink to the submodule's repository location and treat that
+ * as a reserved name.  This tests at an initial submodule update, where the
+ * submodule repo is being created.
+ */
+void test_repo_reservedname__submodule_pointer_during_create(void)
+{
+	git_repository *repo;
+	git_submodule *sm;
+	git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT;
+	git_buf url = GIT_BUF_INIT;
+
+	repo = setup_fixture_super();
+
+	cl_git_pass(git_buf_joinpath(&url, clar_sandbox_path(), "sub.git"));
+	cl_repo_set_string(repo, "submodule.sub.url", url.ptr);
+
+	cl_git_pass(git_submodule_lookup(&sm, repo, "sub"));
+	cl_git_pass(git_submodule_update(sm, 1, &update_options));
+
+	git_submodule_free(sm);
+	git_buf_free(&url);
+}
@@ -0,0 +1 @@
+ref: refs/heads/master
@@ -0,0 +1,8 @@
+[core]
+	repositoryformatversion = 0
+	filemode = false
+	bare = false
+	logallrefupdates = true
+	symlinks = false
+	ignorecase = true
+	hideDotFiles = dotGitOnly
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 b7a59b3f4ea13b985f8a1e0d3757d5cd3331add8 Edward Thomson <[email protected]> 1442522322 -0400	commit (initial): Initial revision
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 b7a59b3f4ea13b985f8a1e0d3757d5cd3331add8 Edward Thomson <[email protected]> 1442522322 -0400	commit (initial): Initial revision
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+0000000000000000000000000000000000000000 b7a59b3f4ea13b985f8a1e0d3757d5cd3331add8 Edward Thomson <[email protected]> 1442522322 -0400 commit (initial): Initial revision`