From a14cba705c2d61d7ac73bb9ed00576cda11f0f30 Mon Sep 17 00:00:00 2001
From: Cameron Eagans <me@cweagans.net>
Date: Sat, 1 Jul 2023 00:36:12 -0600
Subject: [PATCH] Use git init instead of creating a fake git repo
---
src/Patcher/GitInitPatcher.php | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/Patcher/GitInitPatcher.php b/src/Patcher/GitInitPatcher.php
index 8a2c39c..e87a4f6 100644
--- a/src/Patcher/GitInitPatcher.php
+++ b/src/Patcher/GitInitPatcher.php
@@ -3,6 +3,7 @@
namespace cweagans\Composer\Patcher;
use Composer\IO\IOInterface;
+use Composer\Util\Filesystem;
use cweagans\Composer\Patch;
class GitInitPatcher extends GitPatcher
@@ -14,28 +15,25 @@ public function apply(Patch $patch, string $path): bool
return false;
}
- $this->io->write("Creating temporary fake git repo in $path to apply patch", true, IOInterface::VERBOSE);
+ $this->io->write("Creating temporary git repo in $path to apply patch", true, IOInterface::VERBOSE);
- // Create a fake Git repo -- just enough to make Git think it's looking at a real repo.
- $dirs = [
- $path . '/.git',
- $path . '/.git/objects',
- $path . '/.git/refs',
- ];
- foreach ($dirs as $dir) {
- mkdir($dir);
- }
- file_put_contents($path . '/.git/HEAD', "ref: refs/heads/main");
+ // Create a temporary git repository.
+ $status = $this->executeCommand(
+ '%s -C %s init',
+ $this->patchTool(),
+ $path
+ );
+ // If we couldn't create the Git repo, bail out.
+ if (!$status) {
+ return false;
+ }
// Use the git patcher to apply the patch.
$status = parent::apply($patch, $path);
- // Clean up the fake git repo.
- unlink($path . '/.git/HEAD');
- foreach (array_reverse($dirs) as $dir) {
- rmdir($dir);
- }
+ // Clean up the git repo.
+ (new Filesystem($this->executor))->removeDirectory($path . '/.git');
return $status;
}