1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-12-01 19:22:41 +01:00
phorge-arcanist/src/repository/api
epriestley cc1ff38843 When generating diffs in "arc diff", disable Git config option "diff.suppressBlankEmpty"
Summary:
Ref T13432. Git has a "diff.suppressBlankEmpty" config option which makes it emit nonstandard diffs with trimmed trailing whitespace on unchanged blank lines.

Currently, we don't parse these diffs correctly. Even if we do in the future, emitting a more standard diff is desirable.

Explicitly disable this option when executing "git diff" so we build more standard diffs.

Test Plan:
  - Configured this option.
  - Modified a file with a blank line in it without changing the blank line, got this goofy display diff:

{F6985234}

  - Applied patch, rediffed the same change, saw "-c diff.suppressBlankEmpty" in "--trace" output and got this sensible diff:

{F6985235}

Maniphest Tasks: T13432

Differential Revision: https://secure.phabricator.com/D20877
2019-10-29 10:14:40 -07:00
..
__tests__ Correctly parse git status --porcelain=2 output with filenames with spaces 2018-04-19 19:17:16 -07:00
ArcanistGitAPI.php When generating diffs in "arc diff", disable Git config option "diff.suppressBlankEmpty" 2019-10-29 10:14:40 -07:00
ArcanistGitUpstreamPath.php After pushing at the end of "arc land", cascade the origin through all local tracking branches 2015-10-28 14:01:35 -07:00
ArcanistMercurialAPI.php Work around a Windows escaping issue and security conecern in "hg cat --output ..." 2018-10-26 07:28:50 -07:00
ArcanistRepositoryAPI.php Fix errors found by PHPStan 2017-02-18 09:24:19 +00:00
ArcanistSubversionAPI.php Accelerate working tree operations in git 2017-12-23 20:12:50 -08:00