Skip to content

fix git diff commands #1783

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

Merged
merged 1 commit into from
Oct 21, 2024
Merged

fix git diff commands #1783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/bin/refresh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if ($return !== 0) {
/**
* Check if something changed
*/
$output = call('git diff --numstat src/');
$output = call('git diff --numstat -- src/');

if (empty($output)) {
console_log('Nothing changed.');
Expand Down Expand Up @@ -98,7 +98,7 @@ foreach ($output as $line) {
continue;
}

$fileChanges = call('git diff --no-color -U0 '.escapeshellarg($file));
$fileChanges = call('git diff --no-color -U0 -- '.escapeshellarg($file));
foreach ($fileChanges as $lineChange) {
if (!$lineChange) {
continue;
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
echo "###################################################"
echo ""

git diff src
git diff -- src

exit 1
fi
6 changes: 3 additions & 3 deletions tests/Unit/ChangelogTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ static function ($branch) {
});

$output = array_merge(
self::call('git diff --numstat HEAD src/'),
self::call('git diff --numstat ' . $branches[0] . '...HEAD src/')
self::call('git diff --numstat HEAD -- src/'),
self::call('git diff --numstat ' . $branches[0] . '...HEAD -- src/')
);

$changedServices = [];
Expand Down Expand Up @@ -250,7 +250,7 @@ static function ($branch) {

$isCommentOnly = true;
foreach ($changedFiles as $changedFile) {
$changedLines = self::call('git diff --no-color -U0 ' . escapeshellarg($changesService['base'] . $changedFile));
$changedLines = self::call('git diff --no-color -U0 -- ' . escapeshellarg($changesService['base'] . $changedFile));
foreach ($changedLines as $changedLine) {
if (!$changedLine) {
continue;
Expand Down
Loading