diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-23 20:33:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-23 20:33:00 +0000 |
| commit | 11d33ad6b3aeca064dc81d6fa0a1d9a34fcad07e (patch) | |
| tree | 0394bbdfcc1e5aa18eb2ff2cd33255cf00fa5cf4 | |
| parent | cd2558526cbf58fc219d6aca6bf25b1b2b41a194 (diff) | |
| parent | 24c3d3530de5906089479be023aedd02796904c7 (diff) | |
| download | external_updater-11d33ad6b3aeca064dc81d6fa0a1d9a34fcad07e.tar.gz | |
Print out git output on merge errors am: 42e76da892 am: 89f1c353b4 am: 24c3d3530d
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1744975
Change-Id: I26dd0137dbd93f1258123526e05c70e00212c339
| -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 |