Commit Graph

2 Commits (d42c68114ce54ec300e58c94da46d02e0670ba77)

Author SHA1 Message Date
Dan Jacques 1b9a43aab3 Remove special Cygwin PATH manipulation from .bat.
Several boilerplate batch files include a provision to prepend
"depot_tools" to PATH prior to running those tools. This undermines
the utility of PATH overrides, since these tools specifically force their
"depot_tools" sub-paths to be used regardless of environment.

The origin of this behavior is likely limited to a specific fix for a
specific problem, but was then perpetuated by the copy/paste of
boilerplate bootstrap code as more bootstraps were added.

This is important in upcoming configurations, where core tools such as
Python and Git will be overridden via PATH on the bots.

Cygwin users who depended on this behavior should just add "depot_tools"
to their PATH in the appropriate location (i.e. in their .bashrc).

BUG=chromium:714293, chromium:724902
TEST=None

Change-Id: Ie948a430847d20326d2411e9296cacd02f83a537
Reviewed-on: https://chromium-review.googlesource.com/510290
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
9 years ago
dcheng ff84560ede Introduce git merge driver for the blink reformatting
Based on CL from primiano@: https://codereview.chromium.org/2348793003/

This is a simple tool that can help automatically resolve conflicts
from clang-format reformatting patches.

BUG=574611

Review-Url: https://codereview.chromium.org/2356933002
9 years ago