diff options
author | Conley Owens <cco3@android.com> | 2014-01-10 01:20:12 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-10 01:20:13 +0000 |
commit | e695338e21080d3cbe20935db572e4cd0c7a620c (patch) | |
tree | cc525f53929fa4ea24f108d24545c68c7c6cb5ba /subcmds/rebase.py | |
parent | bd80f7eedd5a74f6c5fad745091dcda53a6415bf (diff) | |
parent | 8d20116038ff78b22069dd4e993b5819775f03d1 (diff) | |
download | git-repo-e695338e21080d3cbe20935db572e4cd0c7a620c.tar.gz |
Merge "repo: Support multiple branches for the same project."
Diffstat (limited to 'subcmds/rebase.py')
-rw-r--r-- | subcmds/rebase.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/subcmds/rebase.py b/subcmds/rebase.py index b9a7774d..1bdc1f0b 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py | |||
@@ -62,6 +62,9 @@ branch but need to incorporate new upstream changes "underneath" them. | |||
62 | if opt.interactive and not one_project: | 62 | if opt.interactive and not one_project: |
63 | print('error: interactive rebase not supported with multiple projects', | 63 | print('error: interactive rebase not supported with multiple projects', |
64 | file=sys.stderr) | 64 | file=sys.stderr) |
65 | if len(args) == 1: | ||
66 | print('note: project %s is mapped to more than one path' % (args[0],), | ||
67 | file=sys.stderr) | ||
65 | return -1 | 68 | return -1 |
66 | 69 | ||
67 | for project in all_projects: | 70 | for project in all_projects: |