Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Issue #9: Specify remote repository when fetching live configuration. #10

Open
colans wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue #9: Specify remote repository when fetching live configuration. #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config_extra.drush.inc
View file
Open in desktop
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