[DOC-WEB] [web-doc] master: Revert unintended commit
[email protected] (Jim Winstead) Wed, 27 Nov 2024 19:18:53 +0000
| Newsgroups | php.doc.web |
|---|---|
| Message-ID | <[email protected]> |
Author: Jim Winstead (jimwins)
Date: 2024-11-27T11:14:09-08:00
Commit: https://github.com/php/web-doc/commit/87d197e0b30845ac028e691b7198ee9ab3d2693c
Raw diff: https://github.com/php/web-doc/commit/87d197e0b30845ac028e691b7198ee9ab3d2693c.diff
Revert unintended commit
Changed paths:
M include/lib_revcheck.inc.php
Diff:
diff --git a/include/lib_revcheck.inc.php b/include/lib_revcheck.inc.php
index 2bb5843..882452b 100644
--- a/include/lib_revcheck.inc.php
+++ b/include/lib_revcheck.inc.php
@@ -249,8 +249,7 @@ function showdiff ()
chdir( GIT_DIR . 'en' );
$arg_h = escapeshellarg($h);
$arg_f = escapeshellarg($gitfile);
- echo "git -c {$safedir} diff -b --word-diff=porcelain {$arg_h} -- {$arg_f}";
- $file = `git -c {$safedir} diff -b --word-diff=porcelain {$arg_h} -- {$arg_f}`;
+ $file = `git -c {$safedir} diff --ignore-space-at-eol {$arg_h} -- {$arg_f}`;
if ($file == null)
$file = `git -c {$safedir} diff {$arg_h} -- {$arg_f}`;
$hash = `git -c {$safedir} log -n 1 --pretty=format:%H -- {$arg_f}`;