commit 0a9265e2d633b608090eff79ab4553f0e1c8c7c4
author Mike Frysinger <vapier@google.com> Mon Sep 30 23:59:27 2019 -0400
committer Mike Frysinger <vapier@google.com> Tue Oct 01 05:44:09 2019 +0000
tree e82c95a7c44792af2e5848440f25be40ed4c00b3
parent dc1b59d2c0a7ee00b7e6b111285360c4cff32d2b

diff: handle errors gracefully

If `git diff` fails in any project checkout (e.g. an incomplete
sync), make sure we print that error clearly rather than blowing
up, and exit non-zero in the process.

Bug: https://crbug.com/gerrit/11613
Change-Id: I12f278427cced20f23f8047e7e3dba8f442ee25e
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/239236
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>

subcmds/diff.py

diff --git a/subcmds/diff.py b/subcmds/diff.py
index 1f3abd8..fa41e70 100644
--- a/subcmds/diff.py
+++ b/subcmds/diff.py
@@ -37,5 +37,8 @@
                  help='Paths are relative to the repository root')
 
   def Execute(self, opt, args):
+    ret = 0
     for project in self.GetProjects(args):
-      project.PrintWorkTreeDiff(opt.absolute)
+      if not project.PrintWorkTreeDiff(opt.absolute):
+        ret = 1
+    return ret