Merge eng/ from main on assets push

[scbedd]

@weshaggard I'm extremely pleased with this little diff methodology. Let me know what you think.

• Handle when the patch is empty (call out to git apply --check)
• PR another change that fixes the tools build/livetests
• Resolve integration issue on pure windows git discovered in integration tests. Why is a soft reset failing?
  • This was failing due to a case that should only really ever occur in our test cases, where we force a failed auth by setting an invalid GIT_TOKEN. This meant that we failed to retrieve remote main for the patch. The weird error we were seeing on CLI integration for windows, is that a soft reset with uncommitted changes resulted in a weird error state that git couldn't understand how to resolve automatically. (unable to retrieve promisor remote) By placing the soft reset behind the changes actually being committed, we totally sidestep the entire problem.

[scbedd]

/azp run tools - test-proxy - tests

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).