Skip to content

Fix for diff when run from non-git root directory #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix for diff when run from non-git root directory #375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96d5cf2
fix: append git root path to diff and dirty files
turculaurentiu91 Jul 1, 2025
f8cd4d1
Merge branch 'laravel:main' into main
turculaurentiu91 Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions app/Repositories/GitPathsRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use App\Contracts\PathsRepository;
use App\Factories\ConfigurationFactory;
use Illuminate\Support\Collection;
use Illuminate\Support\Str;
use Symfony\Component\Process\Process;

class GitPathsRepository implements PathsRepository
Expand All @@ -32,17 +31,15 @@ public function __construct($path)
*/
public function dirty()
{
$process = tap(new Process(['git', 'status', '--short', '--', '**.php']))->run();
$process = tap(new Process(['git', 'diff', '--name-only', 'HEAD', '--', '**.php']))->run();

if (! $process->isSuccessful()) {
abort(1, 'The [--dirty] option is only available when using Git.');
}

$dirtyFiles = collect(preg_split('/\R+/', $process->getOutput(), flags: PREG_SPLIT_NO_EMPTY))
->mapWithKeys(fn ($file) => [substr($file, 3) => trim(substr($file, 0, 3))])
->reject(fn ($status) => $status === 'D')
->map(fn ($status, $file) => $status === 'R' ? Str::after($file, ' -> ') : $file)
->values();
->values()
->map(fn ($s) => (string) $s);

return $this->processFileNames($dirtyFiles);
}
Expand Down Expand Up @@ -83,21 +80,26 @@ public function diff($branch)
*/
protected function processFileNames(Collection $fileNames)
{
$gitRoot = trim(tap(new Process(['git', 'rev-parse', '--show-toplevel']))->run()->getOutput());

$processedFileNames = $fileNames
->map(function ($file) {
->map(function ($file) use ($gitRoot) {
$absolutePath = $gitRoot.DIRECTORY_SEPARATOR.$file;

if (PHP_OS_FAMILY === 'Windows') {
$file = str_replace('/', DIRECTORY_SEPARATOR, $file);
$absolutePath = str_replace('/', DIRECTORY_SEPARATOR, $absolutePath);
}

return $this->path.DIRECTORY_SEPARATOR.$file;
return $absolutePath;
})
->all();

$files = array_values(array_map(function ($splFile) {
return $splFile->getPathname();
}, iterator_to_array(ConfigurationFactory::finder()
->in($this->path)
->files()
}, iterator_to_array(
ConfigurationFactory::finder()
->in($this->path)
->files()
)));

return array_values(array_intersect($files, $processedFileNames));
Expand Down