HomePhabricator

Make arc patch slightly better about submodules
96a47759ae4cUnpublished

Unpublished Commit · Learn More

No further details are available.

Description

Make arc patch slightly better about submodules

Summary:
Ref T3776, Ref T479. Say you have some DN, with a submodule X@Y. Later, X@Z in your working copy / repo. If you run arc patch DN, you'd end up with a dirty working copy claiming that X@Z was wrong and it should be X@Y.

To fix, basically run 'submodule init' and 'submodule update'. This makes it so after "arc patch" if you run "git status" it looks clean.

Gross part though now is if you then "git checkout master" you'll have a dirty checkout the other way. I think this is better though.

Test Plan: made a new repository where I added libphutil @ X, did some work (DX), then made libphutil @ y. When I arc patch'd DX, things looked good!

Reviewers: epriestley

Reviewed By: epriestley

CC: csilvers, Korvin, aran

Maniphest Tasks: T479, T3776

Differential Revision: https://secure.phabricator.com/D6837

Details

Provenance
btrahanAuthored on
Reviewer
epriestley
Differential Revision
Restricted Differential Revision
Parents
rARC3ad72195bfc1: When converting a file to a binary, populate the binary's data
Branches
Unknown
Tags
Unknown
Tasks
Restricted Maniphest Task
Restricted Maniphest Task

Event Timeline