bandaid icon indicating copy to clipboard operation
bandaid copied to clipboard

Patch appears to apply, yaml file is created but patch is not applied - Git user globals not set

Open frederickjh opened this issue 8 years ago • 0 comments

Hi!

The yaml file was created. I noticed this because git was telling me no files had been changed, which was not what I expected with patching.

I think that this maybe due to the fact that I am on a Docker container and the Git globals "user.email"nd user.name" were not set. I found this running drush in debug mode.

I think that it was not able to git clone the module but proceeded anyways. What it should most likely do is rollback.

Here is the shell output.

Frederick

$ drush bandaid-patch https://www.drupal.org/node/2215041 $(drush dd menuux)
Looks like a Drupal issue url, looking for patches.                                                                                                               [status]
Please select patch.
 [0]  :  Cancel                                                                                   
 [1]  :  #1 https://www.drupal.org/files/issues/menuux.patch                                      
 [2]  :  #5 https://www.drupal.org/files/issues/menuux-fix_notice_after_upload-2215041-3-D7.patch
2
Could not apply patch.                                                                                    
$ drush bandaid-apply 
Cloning menuux.                                                                                                                                                   [status]
Checking out 7.x-1.0-beta2.                                                                                                                                       [status]
Commit message: Issue #1063804 by pascalgenest, Simon Geaorges: Fixed hook signatures in node_x hooks.                                                            [status]
Error executing command "git commit --allow-empty -m Committing local."                                                                                           [error]
$ drush --debug bandaid-apply 
Drush preflight prepare loaded autoloader at                         [preflight]
/root/.composer/vendor/autoload.php [0.03 sec, 2.18 MB]
Starting Drush preflight. [0.04 sec, 2.18 MB]                                                                                                                     [preflight]
Loading drushrc "/root/.drush/drushrc.php" into "home.drush" scope. [0.04 sec, 2.19 MB]                                                                           [bootstrap]
Cache HIT cid: 7.3.0-commandfiles-0-81cc86c1995ab7206f383ec28ad43baf [0.07 sec, 2.25 MB]                                                                              [debug]
Loading drushrc "/var/www/sites/all/drush/drushrc.php" into "drupal" scope. [0.32 sec, 6.61 MB]                                                                   [bootstrap]
Bootstrap to phase 0. [0.96 sec, 9.93 MB]                                                                                                                         [bootstrap]
Bootstrap to phase 0. [0.96 sec, 9.93 MB]                                                                                                                         [bootstrap]
Found command: bandaid-apply (commandfile=bandaid) [0.97 sec, 9.93 MB]                                                                                            [bootstrap]
Loading drushrc "/root/.drush/deploy.drushrc.php" into "home.drush" scope. [0.97 sec, 9.95 MB]                                                                    [bootstrap]
Calling hook drush_bandaid_apply [1 sec, 10.27 MB]                                                                                                                    [debug]
Cloning menuux. [1.01 sec, 10.62 MB]                                                                                                                              [status]
Executing: git remote update
  Fetching origin
Executing: git clone --no-checkout --verbose --progress --reference /root/.drush/cache/git/menuux-56b74bc1aea6bfb5fddf46a943b99a7b http://git.drupal.org/project/menuux /tmp/bandaid_tmp_1466776035_576d39e3a7497
  Cloning into '/tmp/bandaid_tmp_1466776035_576d39e3a7497'...
  Checking connectivity... done.
Executing: git log --format=oneline -1 7.x-1.0-beta2
  c084e987e0d691c1831bcdc15bece21e206019bd Issue #1063804 by pascalgenest, Simon Geaorges: Fixed hook signatures in node_x hooks
Checking out 7.x-1.0-beta2. [2.44 sec, 10.62 MB]                                                                                                                  [status]
Commit message: Issue #1063804 by pascalgenest, Simon Geaorges: Fixed hook signatures in node_x hooks. [2.45 sec, 10.62 MB]                                       [status]
Executing: git checkout 7.x-1.0-beta2
  Note: checking out '7.x-1.0-beta2'.
  
  You are in 'detached HEAD' state. You can look around, make experimental
  changes and commit them, and you can discard any commits you make in this
  state without impacting any branches by performing another checkout.
  
  If you want to create a new branch to retain commits you create, you may
  do so (now or later) by using -b with the checkout command again. Example:
  
    git checkout -b new_branch_name
  
  HEAD is now at c084e98... Issue #1063804 by pascalgenest, Simon Geaorges: Fixed hook signatures in node_x hooks
Executing: git branch bandaid_local
Executing: git checkout bandaid_local
  Switched to branch 'bandaid_local'
Executing: git --work-tree=/var/www/sites/all/modules/contrib/menuux add --all .
Executing: git reset  -- LICENSE.txt
  Unstaged changes after reset:
  D menuux.admin.inc.orig
  D menuux.admin.inc.rej
  M menuux.info
  D menuux.install
  M menuux.module
  D menuux.module.rej
Executing: git checkout .
Executing: git add --all .
Executing: git commit --allow-empty -m 'Committing local.'
  
  *** Please tell me who you are.
  
  Run
  
    git config --global user.email "[email protected]"
    git config --global user.name "Your Name"
  
  to set your account's default identity.
  Omit --global to set the identity only in this repository.
  
  fatal: unable to auto-detect email address (got 'root@localdevdrupal.(none)')
Error executing command "git commit --allow-empty -m Committing local." [2.68 sec, 10.65 MB]                                                                      [error]
Returned from hook drush_bandaid_apply [2.68 sec, 10.63 MB]                                                                                                           [debug]
Command dispatch complete [2.68 sec, 10.58 MB] 

frederickjh avatar Jun 24 '16 17:06 frederickjh