cherry-pick: tighten up output

If stdout or stderr are empty, don't print empty lines. Also trim any trailing lines so we don't show excess ones. Change-Id: I65fcea191e1f725be03c064cb510578632466013 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/343516 Tested-by: Mike Frysinger <[email protected]> Reviewed-by: LaMont Jones <[email protected]>
zkun90 · Aug 22, 2022 · 8a54a7e · 8a54a7e
1 parent 63a5657
commit 8a54a7e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py
@@ -60,8 +60,10 @@ def Execute(self, opt, args):
                    capture_stderr=True)
     status = p.Wait()
 
-    print(p.stdout, file=sys.stdout)
-    print(p.stderr, file=sys.stderr)
+    if p.stdout:
+      print(p.stdout.strip(), file=sys.stdout)
+    if p.stderr:
+      print(p.stderr.strip(), file=sys.stderr)
 
     if status == 0:
       # The cherry-pick was applied correctly. We just need to edit the