search

kalamuna / terminatur

What terminus began, terminatur finished: Drush CODESCIENCE for Pantheon Integration
MIT License
11 stars 7 forks source link

pullsite throws error if .gitconfig is set to rebase = true #28

Open andrewmallis opened 10 years ago

andrewmallis commented 10 years ago

In .git/config, I have

[branch]
   autosetuprebase = always

which results in remote (multidev) branches, as they are created, to inherit the rebase property:

[branch "sprint"]
   remote = origin
   merge = refs/heads/sprint
   rebase = true

A standard git pull from within the project repo is successful, but

$ drush pullsite mysite.dev

errors out with

Executing: cat /var/www/mysite/.git/config | grep url > /tmp/gitconfigmysite
Executing: rm /tmp/gitconfigmysite
Executing: git --git-dir=/var/www/mysite/.git pull
 Cannot pull with rebase: You have unstaged changes.
 Please commit or stash them.
Could not git pull your code. Check that your SSH key is loaded and the codeserver is reachable. [3.42 sec, 16.3 MB]

checking out the master branch and running pullsite does not error out.