gclient_scm.py - Issue 246433005: gclient: Only _DeleteOrMove if the destination directory is non-empty

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 246433005: gclient: Only _DeleteOrMove if the destination directory is non-empty (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 6 years, 8 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

Index: gclient_scm.py

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

index 89647ac0eb6f0c10cc6569d0804aba7605f0aa5f..b5a09a2249c9086ffd324e3db4a658859920b6db 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -352,7 +352,8 @@ class GitWrapper(SCMWrapper):

(os.path.isdir(self.checkout_path) and

not os.path.exists(os.path.join(self.checkout_path, '.git')))):

if (os.path.isdir(self.checkout_path) and

- not os.path.exists(os.path.join(self.checkout_path, '.git'))):

+ not os.path.exists(os.path.join(self.checkout_path, '.git')) and

+ os.listdir(self.checkout_path)):

# This is a little hack to work around checkouts which are created

# using "gclient config --name ."

if not self.relpath == '.':

« no previous file with comments | « no previous file | tests/gclient_scm_test.py » ('j') | no next file with comments »