gclient_scm.py - Issue 548079: Use --force to reset a git repo before attempting to rebase during gclient sync/update

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gclient_scm.py

Issue 548079: Use --force to reset a git repo before attempting to rebase during gclient sync/update (Closed)

Patch Set: Created 10 years, 11 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:

Index: gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py

index 010c45d183709586cdd42e2eec31aa585e050ca0..65b56c29b2e82450217901c958381229061d3ed9 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -213,6 +213,8 @@ class GitWrapper(SCMWrapper, scm.GIT):

self._Run(['remote', 'update'], redirect_stdout=False)

files = self._Run(['diff', new_base, '--name-only']).split()

file_list.extend([os.path.join(self.checkout_path, f) for f in files])

+ if options.force:

+ self._Run(['reset', '--hard', merge_base], redirect_stdout=False)

self._Run(['rebase', '-v', '--onto', new_base, merge_base, cur_branch],

redirect_stdout=False, checkrc=False)

« no previous file with comments | « no previous file | no next file » | no next file with comments »