Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Unified Diff: gclient_scm.py

Issue 2448993003: Correctly guard file_list modification in gclient update (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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():
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698