commit c3937b9128be24e1481eb9173acaef842955e5f9
author agable <agable@chromium.org> Tue Oct 25 10:13:03 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 25 10:13:03 2016 -0700
tree 8c9e59995e92114b574cd25e57e59555f651e789
parent 2f3f137de7a627772cd37801530a4ce6458c5d81

Correctly guard file_list modification in gclient update

TBR=smut@chromium.org
BUG=658959

Review-Url: https://codereview.chromium.org/2448993003

gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py
index c929544..4a4e601 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -674,8 +674,9 @@
             # whitespace between projects when syncing.
             self.Print('')
 
-      file_list.extend(
-          [os.path.join(self.checkout_path, f) for f in rebase_files])
+      if file_list is not None:
+        file_list.extend(
+            [os.path.join(self.checkout_path, f) for f in rebase_files])
 
     # If the rebase generated a conflict, abort and ask user to fix
     if self._IsRebasing():