Index: gclient_scm.py |
diff --git a/gclient_scm.py b/gclient_scm.py |
index c929544d98ee45d8a21ee014c221b4bf7c8b8a6b..4a4e6015461582fbf28a1034f63e66aba1e26770 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(): |