diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-23 20:07:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-23 20:07:32 +0000 |
| commit | 89f1c353b4848e1d3c2d66a8f4c2b323e5ce2d7a (patch) | |
| tree | 0394bbdfcc1e5aa18eb2ff2cd33255cf00fa5cf4 | |
| parent | 673d33b5dccf98a81b0a14026d6275fc452c4a09 (diff) | |
| parent | 42e76da892ec8b341d505813120d8ae12f45975e (diff) | |
| download | external_updater-89f1c353b4848e1d3c2d66a8f4c2b323e5ce2d7a.tar.gz | |
Print out git output on merge errors am: 42e76da892
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1744975
Change-Id: Ibeb48bfe5b074fb881a2d6f90c0dbcb00adde86a
| -rw-r--r-- | git_utils.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git_utils.py b/git_utils.py index f96a600..e369af3 100644 --- a/git_utils.py +++ b/git_utils.py @@ -142,8 +142,9 @@ def merge(proj_path: Path, branch: str) -> None: """Merges a branch.""" try: _run(['git', 'merge', branch, '--no-commit'], cwd=proj_path) - except subprocess.CalledProcessError: - # Merge failed. Error is already written to console. + except subprocess.CalledProcessError as err: + if hasattr(err, "output"): + print(err.output) _run(['git', 'merge', '--abort'], cwd=proj_path) raise |