diff options
| author | Josh Rosen <joshrosen@databricks.com> | 2016-01-13 11:56:30 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2016-01-13 11:56:30 -0800 |
| commit | 97e0c7c5af4d002937f9ee679568bb501d8818fc (patch) | |
| tree | 76614d9a5865e4ad15b63c4cf8404973dbfba7d1 /dev/mima | |
| parent | 38148f7373ee678cd538ce5eae0a75e15c62db8a (diff) | |
| download | spark-97e0c7c5af4d002937f9ee679568bb501d8818fc.tar.gz spark-97e0c7c5af4d002937f9ee679568bb501d8818fc.tar.bz2 spark-97e0c7c5af4d002937f9ee679568bb501d8818fc.zip | |
[SPARK-9383][PROJECT-INFRA] PR merge script should reset back to previous branch when possible
This patch modifies our PR merge script to reset back to a named branch when restoring the original checkout upon exit. When the committer is originally checked out to a detached head, then they will be restored back to that same ref (the same as today's behavior).
This is a slightly updated version of #7569, with an extra fix to handle the detached head corner-case.
Author: Josh Rosen <joshrosen@databricks.com>
Closes #10709 from JoshRosen/SPARK-9383.
Diffstat (limited to 'dev/mima')
0 files changed, 0 insertions, 0 deletions