From bb241bc0485112def64c80ebe4968b3373326e54 Mon Sep 17 00:00:00 2001 From: Owen Barton Date: Mon, 10 Dec 2012 12:46:48 -0800 Subject: Owen Barton: Generated with Drush iq --- iq.drush.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iq.drush.inc b/iq.drush.inc index 5264cc2..c110a05 100644 --- a/iq.drush.inc +++ b/iq.drush.inc @@ -223,7 +223,7 @@ function drush_iq_diff($number = NULL) { // If there are unstaged changes, commit them if (!empty($status_output)) { // TODO: can we easily ignore *.patch, etc., or easily add only modified files? - $result = drush_shell_exec("git add ."); + $result = drush_shell_exec("git add -u ."); $result = drush_shell_exec("git commit -m %s", $commit_comment); if (!$result) { return drush_set_error('DRUSH_IQ_DIFF_CANNOT_COMMIT', dt("Commit failed.")); @@ -604,7 +604,7 @@ function drush_iq_merge($number = NULL) { if (!drush_get_option('no-commit', FALSE)) { $commit_comment = _drush_iq_create_commit_comment($issue_info, drush_get_option('committer', TRUE), drush_get_option('message', FALSE)); // TODO: can we easily ignore *.patch, etc., or easily add only modified files? - $result = drush_shell_exec("git add ."); + $result = drush_shell_exec("git add -u ."); $result = drush_shell_exec("git commit -m %s", $commit_comment); if (!$result) { return drush_set_error('DRUSH_IQ_DIFF_CANNOT_COMMIT', dt("Commit failed.")); @@ -635,7 +635,7 @@ function _drush_iq_create_branch(&$issue_info, $ignore = array()) { $branch_merges_with = _drush_iq_get_branch_at_dir($project_dir); if (empty($branch_merges_with)) { $result = drush_shell_cd_and_exec($project_dir, "git init"); - $result = drush_shell_cd_and_exec($project_dir, "git add ."); + $result = drush_shell_cd_and_exec($project_dir, "git add -u ."); foreach ($ignore as $filename) { if (dirname($filename) == $project_dir) { $result = drush_shell_cd_and_exec($project_dir, "git rm --cached -- %s", basename($filename)); -- 1.7.9.5