Page MenuHomePhabricator

Provide a username and email when running `git merge --squash`

Authored by epriestley on Oct 26 2015, 9:09 PM.



Ref T182. This command should never actually generate a commit because --squash prevents that, but git seems to sometimes hit a check for username/email configuration (maybe when merging a non-fastforward?).

Give it some dummy values to placate it. This command shouldn't commit anything so these values should never actually be used.

Test Plan

Diff Detail

rP Phabricator
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

epriestley updated this revision to Diff 34631.Oct 26 2015, 9:09 PM
epriestley retitled this revision from to Provide a username and email when running `git merge --squash`.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added reviewers: chad, Mnkras.
Mnkras accepted this revision.Oct 26 2015, 9:11 PM
Mnkras edited edge metadata.
This revision is now accepted and ready to land.Oct 26 2015, 9:11 PM

I feel like a bug should be posted to git about this...

This revision was automatically updated to reflect the committed changes.