From 77bd7360ab20e3ee673e474d767495b3b49920ca Mon Sep 17 00:00:00 2001 From: "mmoss@chromium.org" Date: Wed, 25 Sep 2013 23:46:14 +0000 Subject: [PATCH] Don't allow 'detached head' branch creation to fail. This fixes an error if the branch already exists. Review URL: https://chromiumcodereview.appspot.com/24360009 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@225278 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient_scm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gclient_scm.py b/gclient_scm.py index c9af57ce5e..5288f6c5fc 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -1021,7 +1021,7 @@ class GitWrapper(SCMWrapper): # Let's just save off the commit so we can proceed. name = ('saved-by-gclient-' + self._Capture(['rev-parse', '--short', 'HEAD'])) - self._Capture(['branch', name]) + self._Capture(['branch', '-f', name]) print('\n_____ found an unreferenced commit and saved it as \'%s\'' % name)