We have devised a workflow for vendoring in changes that goes something like:
Pull in files from upstream
Run git apply over the top of them to localize for our needs
Fail if the patch does not apply cleanly
When absorbing new versions from upstream, we do a three-way merge of "old upstream", "new upstream", and our localizations. To do this with Gilt, it is necessary to temporarily comment out the post-commands from our Giltfile.yaml to get a "pristine" copy.
Gilt could help with this by providing a command-line switch that only runs the file overlay steps and avoids running post-commands.
TL;DR: we'd like a --no-commands switch, or something similar.
Story time!
We have devised a workflow for vendoring in changes that goes something like:
git apply
over the top of them to localize for our needsWhen absorbing new versions from upstream, we do a three-way merge of "old upstream", "new upstream", and our localizations. To do this with Gilt, it is necessary to temporarily comment out the post-commands from our
Giltfile.yaml
to get a "pristine" copy.Gilt could help with this by providing a command-line switch that only runs the file overlay steps and avoids running post-commands.
TL;DR: we'd like a
--no-commands
switch, or something similar.