fix: only run git init in new actors if not running from a git repository (#925)

Author: vladfrangu

src/commands/create.ts

@@ -314,7 +314,9 @@ export class CreateCommand extends ApifyCommand<typeof CreateCommand> {
 
 		// Initialize git repository before reporting success, but store result for later
 		let gitInitResult: { success: boolean; error?: Error } = { success: true };
-		if (!skipGitInit) {
+		const cwdHasGit = await stat(join(cwd, '.git')).catch(() => null);
+
+		if (!skipGitInit && !cwdHasGit) {
 			try {
 				await execWithLog({
 					cmd: 'git',
@@ -339,7 +341,7 @@ export class CreateCommand extends ApifyCommand<typeof CreateCommand> {
 		}
 
 		// Report git initialization result after actor creation success
-		if (!skipGitInit) {
+		if (!skipGitInit && !cwdHasGit) {
 			if (gitInitResult.success) {
 				info({
 					message: `Git repository initialized in '${actorName}'. You can now commit and push your Actor to Git.`,

test/local/__fixtures__/commands/run/python/works-with-spaces-in-path-to-actor.test.ts

@@ -16,7 +16,7 @@ async def main():
 
 const { beforeAllCalls, afterAllCalls, joinCwdPath, forceNewCwd } = useTempPath(actorName.replaceAll('-', ' '), {
 	create: true,
-	remove: true,
+	remove: false,
 	cwd: true,
 	cwdParent: false,
 });
@@ -36,7 +36,7 @@ describe('[python] spaces in path to actor', () => {
 
 		await writeFile(joinCwdPath('src', 'main.py'), mainFile);
 
-		outputPath = joinCwdPath(getLocalKeyValueStorePath(), 'OUTPUT.txt');
+		outputPath = joinCwdPath(getLocalKeyValueStorePath(), 'OUTPUT');
 	});
 
 	afterAll(async () => {

test/local/__fixtures__/python_support.test.ts

@@ -77,7 +77,7 @@ async def main():
 		await testRunCommand(RunCommand, {});
 
 		// Check Actor output
-		const actorOutputPath = joinPath(getLocalKeyValueStorePath(), 'OUTPUT.json');
+		const actorOutputPath = joinPath(getLocalKeyValueStorePath(), 'OUTPUT');
 		const actorOutput = JSON.parse(readFileSync(actorOutputPath, 'utf8'));
 		expect(actorOutput).toStrictEqual(expectedOutput);
 	});

test/local/commands/create.test.ts

@@ -1,4 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs';
+import { mkdir, rm } from 'node:fs/promises';
 
 import { KEY_VALUE_STORE_KEYS } from '@apify/consts';
 
@@ -9,12 +10,13 @@ import { useConsoleSpy } from '../../__setup__/hooks/useConsoleSpy.js';
 import { useTempPath } from '../../__setup__/hooks/useTempPath.js';
 
 const actName = 'create-my-actor';
-const { beforeAllCalls, afterAllCalls, joinPath, toggleCwdBetweenFullAndParentPath, tmpPath } = useTempPath(actName, {
-	create: true,
-	remove: true,
-	cwd: true,
-	cwdParent: true,
-});
+const { beforeAllCalls, afterAllCalls, joinPath, joinCwdPath, toggleCwdBetweenFullAndParentPath, tmpPath } =
+	useTempPath(actName, {
+		create: true,
+		remove: true,
+		cwd: true,
+		cwdParent: true,
+	});
 
 const { lastErrorMessage } = useConsoleSpy();
 
@@ -150,4 +152,26 @@ describe('apify create', () => {
 		// Check that .git directory does not exist
 		expect(existsSync(joinPath('.git'))).toBeFalsy();
 	});
+
+	it('should skip git initialization when run from within an existing git repository', async () => {
+		const ACT_TEMPLATE = 'project_empty';
+
+		// Create a .git folder in the parent directory (cwd) to simulate being inside a git repository
+		await mkdir(joinCwdPath('.git'), { recursive: true });
+
+		await testRunCommand(CreateCommand, {
+			args_actorName: actName,
+			flags_template: ACT_TEMPLATE,
+			flags_skipDependencyInstall: true,
+		});
+
+		toggleCwdBetweenFullAndParentPath();
+
+		// Check that .git directory does not exist in the newly created actor directory
+		expect(existsSync(joinCwdPath('.git'))).toBeFalsy();
+
+		// Cleanup
+		toggleCwdBetweenFullAndParentPath();
+		await rm(joinCwdPath('.git'), { recursive: true });
+	});
 });