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

Unified Diff: gclient_scm.py

Issue 661229: Ensure --revision is used when specified (Closed)
Patch Set: Created 10 years, 10 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 26d9a1588de1caa5b19d8690d65fa915c191df04..5fb4e16dc716f9d012ae79e7f882291a763443fe 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -275,8 +275,11 @@ class GitWrapper(SCMWrapper, scm.GIT):
# Can't find a merge-base since we don't know our upstream. That makes
# this command VERY likely to produce a rebase failure. For now we
# assume origin is our upstream since that's what the old behavior was.
- self._AttemptRebase('origin', files=files, verbose=options.verbose,
- printed_path=printed_path)
+ upstream_branch = 'origin'
+ if options.revision:
+ upstream_branch = revision
+ self._AttemptRebase(upstream_branch, files=files,
+ verbose=options.verbose, printed_path=printed_path)
printed_path = True
elif rev_type is 'hash':
# case 2
« 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