diff options
Diffstat (limited to 'subcmds/rebase.py')
-rw-r--r-- | subcmds/rebase.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subcmds/rebase.py b/subcmds/rebase.py index 2c1752d7..a8d58cdb 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py | |||
@@ -55,14 +55,14 @@ branch but need to incorporate new upstream changes "underneath" them. | |||
55 | help='Stash local modifications before starting') | 55 | help='Stash local modifications before starting') |
56 | 56 | ||
57 | def Execute(self, opt, args): | 57 | def Execute(self, opt, args): |
58 | all = self.GetProjects(args) | 58 | all_projects = self.GetProjects(args) |
59 | one_project = len(all) == 1 | 59 | one_project = len(all_projects) == 1 |
60 | 60 | ||
61 | if opt.interactive and not one_project: | 61 | if opt.interactive and not one_project: |
62 | print >>sys.stderr, 'error: interactive rebase not supported with multiple projects' | 62 | print >>sys.stderr, 'error: interactive rebase not supported with multiple projects' |
63 | return -1 | 63 | return -1 |
64 | 64 | ||
65 | for project in all: | 65 | for project in all_projects: |
66 | cb = project.CurrentBranch | 66 | cb = project.CurrentBranch |
67 | if not cb: | 67 | if not cb: |
68 | if one_project: | 68 | if one_project: |