Skip to content

Commit

Permalink
Issue drush-ops#9: Specify remote repository when fetching live confi…
Browse files Browse the repository at this point in the history
…guration.
  • Loading branch information
colans committed Feb 11, 2016
1 parent a6942ba commit 9811120
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion config_extra.drush.inc
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ function _drush_cme_copy_remote_configuration_via_git(&$merge_info) {
return drush_set_error('DRUSH_CONFIG_EXPORT_FAILURE', dt("`git pull` failed. Output:\n\n!output", array('!output' => implode("\n", drush_shell_exec_output()))));
}
// Check out the 'live-config' branch. This should always exist; config-export should create it for us.
$result = drush_shell_cd_and_exec($configuration_path, 'git fetch');
$result = drush_shell_cd_and_exec($configuration_path, 'git fetch %s', $merge_info['remote']);
$result = drush_shell_cd_and_exec($configuration_path, 'git checkout %s', $merge_info['live-config']);
if (!$result) {
return drush_set_error('DRUSH_CONFIG_MERGE_FAILURE', dt("Could not switch to working branch !b", array('!b' => $merge_info['live-config'])));
Expand Down

0 comments on commit 9811120

Please sign in to comment.