From 2ee67787bdb972d00342fcdf1cab88c14071d121 Mon Sep 17 00:00:00 2001 From: Alexander Veselov Date: Fri, 24 Nov 2023 10:01:11 +0200 Subject: [PATCH] SDK-5590: Ignore empty lines in diff (#159) --- src/VersionControlSystem/GitRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VersionControlSystem/GitRepository.php b/src/VersionControlSystem/GitRepository.php index 151f4870..968aeac1 100644 --- a/src/VersionControlSystem/GitRepository.php +++ b/src/VersionControlSystem/GitRepository.php @@ -38,7 +38,7 @@ public function getHeadHashCommit(): string public function getDiff(string $originalBranch, string $currentBranch): string { $gitDiffOutput = $this->execute( - ['diff', $originalBranch . '..' . $currentBranch], + ['diff', $originalBranch . '..' . $currentBranch, '--ignore-blank-lines'], ); return implode(PHP_EOL, $gitDiffOutput);