From c3937b9128be24e1481eb9173acaef842955e5f9 Mon Sep 17 00:00:00 2001
From: agable <agable@chromium.org>
Date: Tue, 25 Oct 2016 10:13:03 -0700
Subject: [PATCH] Correctly guard file_list modification in gclient update

TBR=smut@chromium.org
BUG=658959

Review-Url: https://codereview.chromium.org/2448993003
---
 gclient_scm.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gclient_scm.py b/gclient_scm.py
index c929544d9..4a4e60154 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -674,8 +674,9 @@ class GitWrapper(SCMWrapper):
             # 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():