Merge branch 'gc/discover-not-setup'

gitster · gitster · commit 01202f5f6831 · 2023-06-23T11:21:16.000-07:00
discover_git_directory() no longer touches the_repository.

* gc/discover-not-setup:
  setup.c: don't setup in discover_git_directory()
diff --git a/setup.c b/setup.c
@@ -1422,14 +1422,6 @@ int discover_git_directory(struct strbuf *commondir,
 		return -1;
 	}
 
-	the_repository->repository_format_worktree_config =
-		candidate.worktree_config;
-
-	/* take ownership of candidate.partial_clone */
-	the_repository->repository_format_partial_clone =
-		candidate.partial_clone;
-	candidate.partial_clone = NULL;
-
 	clear_repository_format(&candidate);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1422,14 +1422,6 @@ int discover_git_directory(struct strbuf *commondir,`
`1422`	`1422`	`return -1;`
`1423`	`1423`	`}`
`1424`	`1424`
`1425`		`- the_repository->repository_format_worktree_config =`
`1426`		`- candidate.worktree_config;`
`1427`		`-`
`1428`		`- /* take ownership of candidate.partial_clone */`
`1429`		`- the_repository->repository_format_partial_clone =`
`1430`		`- candidate.partial_clone;`
`1431`		`- candidate.partial_clone = NULL;`
`1432`		`-`
`1433`	`1425`	`clear_repository_format(&candidate);`
`1434`	`1426`	`return 0;`
`1435`	`1427`	`}`