summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Hedstrom2013-01-09 16:26:00 (GMT)
committer Jonathan Hedstrom2013-01-09 16:26:00 (GMT)
commit98dd8159d06f496a567fd04361edd76fa1e0448c (patch)
tree7f38c6040e3620fe3d13fe8e500d597f3894ef15
parent64a205ab487c1a56e4f88dd4122ffc1e8cd6bd5f (diff)
Issue #1276872 by jgraham, mrfelton, Steven Jones, patcon: Fixed GIT_WORK_TREE=. fails to apply patch in install profile when using --working-copy.
-rw-r--r--commands/make/make.project.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/commands/make/make.project.inc b/commands/make/make.project.inc
index c4ca7f4..1fe9efb 100644
--- a/commands/make/make.project.inc
+++ b/commands/make/make.project.inc
@@ -208,10 +208,10 @@ class DrushMakeProject {
// http://drupal.org/node/1054616
$patch_levels = array('-p1', '-p0');
foreach ($patch_levels as $patch_level) {
- $checked = drush_shell_exec('cd %s && GIT_WORK_TREE=. git apply --check %s %s --verbose', $project_directory, $patch_level, $filename);
+ $checked = drush_shell_exec('cd %s && GIT_DIR=. git apply --check %s %s --verbose', $project_directory, $patch_level, $filename);
if ($checked) {
// Apply the first successful style.
- $patched = drush_shell_exec('cd %s && GIT_WORK_TREE=. git apply %s %s --verbose', $project_directory, $patch_level, $filename);
+ $patched = drush_shell_exec('cd %s && GIT_DIR=. git apply %s %s --verbose', $project_directory, $patch_level, $filename);
break;
}
}