This repository was archived by the owner on Oct 1, 2020. It is now read-only.
File tree Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -58,26 +58,22 @@ function checkoutSourceCodeFromGit()
58
58
function initMagentoCeGit()
59
59
{
60
60
initGitRepository ${repository_url_ce} " CE" " ${magento_ce_dir} "
61
- cd ${vagrant_dir}
62
61
}
63
62
64
63
function initMagentoEeGit()
65
64
{
66
65
initGitRepository ${repository_url_ee} " EE" " ${magento_ee_dir} "
67
- cd ${vagrant_dir}
68
66
}
69
67
70
68
function initMagentoCeSampleGit()
71
69
{
72
70
repository_url_ce_sample_data=" $( bash " ${vagrant_dir} /scripts/get_config_value.sh" " repository_url_ce_sample_data" ) "
73
71
initGitRepository ${repository_url_ce_sample_data} " CE sample data" " ${magento_ce_sample_data_dir} "
74
- cd ${vagrant_dir}
75
72
}
76
73
77
74
function initMagentoEeSampleGit()
78
75
{
79
76
initGitRepository ${repository_url_ee_sample_data} " EE sample data" " ${magento_ee_sample_data_dir} "
80
- cd ${vagrant_dir}
81
77
}
82
78
83
79
# Initialize the cloning and checkout of a git repository
@@ -104,9 +100,10 @@ function initGitRepository()
104
100
if [[ -n ${branch} ]]; then
105
101
status " Checking out branch ${branch} of ${repository_name} repository"
106
102
cd " ${directory} "
107
- git fetch
108
- git checkout ${branch}
103
+ git fetch 2> >( logError ) > >( log )
104
+ git checkout ${branch} 2> >( log ) > >( log )
109
105
fi
106
+ cd " ${vagrant_dir} "
110
107
}
111
108
112
109
# Get the git repository from a repository_url setting in config.yaml
You can’t perform that action at this time.
0 commit comments