[web-doc] master: Thank You. Closes GH-42
| From: | André L F S Bacci via Nilgün Belma Bugüner | Date: | Sat, 09 Sep 2023 22:57:00 +0000 |
| Subject: | [web-doc] master: Thank You. Closes GH-42 | ||
| Groups: | php.doc.web | ||
| Request: | Send a blank email to doc-web+get-2514@lists.php.net to get a copy of this message | ||
Author: André L F S Bacci
Committer: Nilgün Belma Bugüner (nilgun)
Date: 2023-09-10T01:43:30+03:00
Commit: https://github.com/php/web-doc/commit/364f913efb1a82dddce17ef35b30ca37651d0295
Raw diff: https://github.com/php/web-doc/commit/364f913efb1a82dddce17ef35b30ca37651d0295.diff
Thank You. Closes GH-42
Changed paths:
M include/lib_revcheck.inc.php
Diff:
diff --git a/include/lib_revcheck.inc.php b/include/lib_revcheck.inc.php
index 745df8f..ad3f0db 100644
--- a/include/lib_revcheck.inc.php
+++ b/include/lib_revcheck.inc.php
@@ -252,7 +252,9 @@ function showdiff ()
chdir( GIT_DIR . 'en' );
$arg_h = escapeshellarg($h);
$arg_f = escapeshellarg($gitfile);
- $file =
git diff {$arg_h} -- {$arg_f};
+ $file = git diff --ignore-space-at-eol {$arg_h} -- {$arg_f};
+ if ($file == null)
+ $file = git diff {$arg_h} -- {$arg_f};
$hash = git log -n 1 --pretty=format:%H -- {$arg_f};
chdir( $cwd );
if (!$file) return;