2 files changed, 14 insertions, 4 deletions
diff --git a/source/cgit.c b/source/cgit.c
index 3571bc4..254062f 100644
--- a/source/cgit.c
+++ b/source/cgit.c
@@ -395,6 +395,7 @@ static void build_scan_key(struct strbuf *key, const char *path)
 	};
 	const int numbers[] = {
 		ctx.cfg.scan_hidden_path,
+		ctx.cfg.case_sensitive_sort,
 		ctx.cfg.remove_suffix,
 		ctx.cfg.section_from_path,
 		ctx.cfg.enable_git_config,
diff --git a/source/scan-tree.c b/source/scan-tree.c
index ec991e0..91db419 100644
--- a/source/scan-tree.c
+++ b/source/scan-tree.c
@@ -296,6 +296,8 @@ static void scan_path(const char *base, const char *path)
 {
 	DIR *dir;
 	struct dirent *ent;
+	struct string_list entries = STRING_LIST_INIT_DUP;
+	struct string_list_item *entry;
 	struct strbuf pathbuf = STRBUF_INIT;
 	size_t pathlen = strlen(path);
 	struct stat st;
@@ -321,11 +323,17 @@ static void scan_path(const char *base, const char *path)
 	// Take in the '/' that "/.git" left in the buffer, since the loop below
 	// truncates to this length and then appends an entry name straight on.
 	pathlen++;
-	while ((ent = readdir(dir))) {
-		if (!should_scan(ent))
-			continue;
+	while ((ent = readdir(dir)))
+		if (should_scan(ent))
+			string_list_append(&entries, ent->d_name);
+	// A scan has no cgitrc order for the index to keep, and readdir hands
+	// entries back in whatever order the filesystem stores them, so they
+	// are taken by name, compared the way the index compares names.
+	entries.cmp = ctx.cfg.case_sensitive_sort ? strcmp : strcasecmp;
+	string_list_sort(&entries);
+	for_each_string_list_item(entry, &entries) {
 		strbuf_setlen(&pathbuf, pathlen);
-		strbuf_addstr(&pathbuf, ent->d_name);
+		strbuf_addstr(&pathbuf, entry->string);
 		if (stat(pathbuf.buf, &st)) {
 			fprintf(stderr, "[cgit] Unable to stat %s: %s (%d)\n", pathbuf.buf, strerror(errno),
 				errno);
@@ -335,6 +343,7 @@ static void scan_path(const char *base, const char *path)
 			scan_path(base, pathbuf.buf);
 	}
 end:
+	string_list_clear(&entries, 0);
 	strbuf_release(&pathbuf);
 	closedir(dir);
 }