Use --no-ext-diff in `arc land` call to `git diff`
ClosedPublic
Actions

Authored by epriestley on Aug 6 2016, 1:41 PM.

Details

Reviewers

chad

Maniphest Tasks

T11435: arc land doesn't work if visual diff tool is configured

Commits

rARCc9337c2ade7c: (stable) Promote 2016 Week 32
rARCe5be662d15a8: Use --no-ext-diff in `arc land` call to `git diff`

Summary

Fixes T11435. This isn't a perfect solution since there's a little code duplication, but a perfect solution is probably a bit more involved.

See T11435 for some discussion. In particular, most git diff commands already get this flag via ArcanistGitAPI->getDiffBaseOptions().

Test Plan

Will land this change.

Diff Detail

Repository

rARC Arcanist

Branch

noex1

Lint

Lint Passed

Severity	Location	Code	Message
Advice	src/land/ArcanistGitLandEngine.php:184	XHP16	TODO Comment

Unit

Tests Passed

Build Status

Buildable 13255
Build 16991: Run Core Tests
Build 16990: arc lint + arc unit

Event Timeline

epriestley updated this revision to Diff 39379.Aug 6 2016, 1:41 PM

epriestley retitled this revision from to Use --no-ext-diff in `arc land` call to `git diff`.

epriestley updated this object.

epriestley edited the test plan for this revision. (Show Details)

epriestley added a reviewer: chad.

epriestley added a task: T11435: arc land doesn't work if visual diff tool is configured.

chad accepted this revision.Aug 6 2016, 2:18 PM

chad edited edge metadata.

This revision is now accepted and ready to land.Aug 6 2016, 2:18 PM

Closed by commit rARCe5be662d15a8: Use --no-ext-diff in `arc land` call to `git diff` (authored by epriestley, committed by epriestley). · Explain WhyAug 6 2016, 4:00 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

src/

land/

ArcanistGitLandEngine.php

5 lines

Diff 39379

View Options

src/land/ArcanistGitLandEngine.php

Use --no-ext-diff in `arc land` call to `git diff`ClosedPublicActions