Commit e8f4da09 authored by tandrii@chromium.org's avatar tandrii@chromium.org

Revert of Fix git recipe module to use git.bad as package resouce. (patchset...

Revert of Fix git recipe module to use git.bad as package resouce. (patchset #1 id:1 of https://codereview.chromium.org/1742403002/ )

Reason for revert:
broke win builder bug 590806

Original issue's description:
> Fix git recipe module to use git.bad as package resouce.
> 
> R=phajdan.jr@chromium.org
> BUG=579160
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299005

TBR=phajdan.jr@chromium.org,tandrii@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=579160

Review URL: https://codereview.chromium.org/1750733002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299011 0039d316-1c4b-4281-b951-d872f2087c98
parent 575d41a4
......@@ -18,7 +18,7 @@ class GitApi(recipe_api.RecipeApi):
kwargs.setdefault('cwd', self.m.path['checkout'])
git_cmd = ['git']
if self.m.platform.is_win:
git_cmd = [self.package_resource('git.bat')]
git_cmd = [self.m.path['depot_tools'].join('git.bat')]
options = kwargs.pop('git_config_options', {})
for k, v in sorted(options.iteritems()):
git_cmd.extend(['-c', '%s=%s' % (k, v)])
......@@ -172,7 +172,8 @@ class GitApi(recipe_api.RecipeApi):
remote_name = 'origin'
if self.m.platform.is_win:
git_setup_args += ['--git_cmd_path', self.package_resource('git.bat')]
git_setup_args += ['--git_cmd_path',
self.m.path['depot_tools'].join('git.bat')]
step_suffix = '' if step_suffix is None else ' (%s)' % step_suffix
self.m.python(
......
......@@ -9,14 +9,14 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git",
"--git_cmd_path",
"RECIPE_PACKAGE[depot_tools]\\git.bat"
"[DEPOT_TOOLS]\\git.bat"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"retry",
"fetch",
"origin",
......@@ -28,7 +28,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"checkout",
"-f",
"FETCH_HEAD"
......@@ -38,7 +38,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"rev-parse",
"HEAD"
],
......@@ -51,7 +51,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"clean",
"-f",
"-d",
......@@ -62,7 +62,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"submodule",
"sync"
],
......@@ -71,7 +71,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"submodule",
"update",
"--init",
......@@ -82,7 +82,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"-c",
"foo=bar",
"count-objects",
......@@ -94,7 +94,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"config",
"--get",
"remote.origin.url"
......@@ -108,7 +108,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"show",
"HEAD",
"--format=%at",
......@@ -120,7 +120,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"fetch",
"origin",
"--tags"
......@@ -130,7 +130,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"status"
],
"cwd": "[SLAVE_BUILD]\\src",
......@@ -138,7 +138,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"status"
],
"cwd": "[SLAVE_BUILD]\\src",
......@@ -146,7 +146,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"status"
],
"cwd": "[SLAVE_BUILD]\\src",
......@@ -154,7 +154,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"rebase",
"origin/master"
],
......@@ -163,7 +163,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"bundle",
"create",
"[SLAVE_BUILD]\\all.bundle",
......
[
{
"cmd": [
"RECIPE_PACKAGE[depot_tools]\\git.bat",
"[DEPOT_TOOLS]\\git.bat",
"diff",
"--cached",
"--name-only"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment