Merge 2901e03 into 2dda6d6

eiriksm · Apr 26, 2019 · eb7bcc6 · eb7bcc6
2 parents 2dda6d6 + 2901e03
commit eb7bcc6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/CosyComposer.php b/src/CosyComposer.php
@@ -846,11 +846,12 @@ public function run()
                 // This might have cleaned out the auth file, so we re-export it.
                 $this->execCommand(sprintf('COMPOSER_ALLOW_SUPERUSER=1 composer config --auth github-oauth.github.com %s', $this->userToken));
                 $command = sprintf(
-                    'GIT_AUTHOR_NAME="%s" GIT_AUTHOR_EMAIL="%s" GIT_COMMITTER_NAME="%s" GIT_COMMITTER_EMAIL="%s" git commit composer.* -m "Update %s"',
+                    'GIT_AUTHOR_NAME="%s" GIT_AUTHOR_EMAIL="%s" GIT_COMMITTER_NAME="%s" GIT_COMMITTER_EMAIL="%s" git commit %s -m "Update %s"',
                     $this->githubUserName,
                     $this->githubEmail,
                     $this->githubUserName,
                     $this->githubEmail,
+                    $lock_file_contents ? 'composer.json composer.lock' : 'composer.json',
                     $package_name
                 );
                 if ($this->execCommand($command, false)) {

diff --git a/test/integration/UpdatesTest.php b/test/integration/UpdatesTest.php
@@ -414,7 +414,7 @@ function ($cmd) use (&$called, $dir) {
                     if ($cmd == $command) {
                         file_put_contents("$dir/composer.lock", file_get_contents(__DIR__ . '/../fixtures/composer-psr-log.lock-updated'));
                     }
-                    if ($cmd == 'GIT_AUTHOR_NAME="" GIT_AUTHOR_EMAIL="" GIT_COMMITTER_NAME="" GIT_COMMITTER_EMAIL="" git commit composer.* -m "Update psr/log"') {
+                    if ($cmd == 'GIT_AUTHOR_NAME="" GIT_AUTHOR_EMAIL="" GIT_COMMITTER_NAME="" GIT_COMMITTER_EMAIL="" git commit composer.json composer.lock -m "Update psr/log"') {
                         $return = 1;
                     }
                     if (strpos($cmd, 'rm -rf /tmp/') === 0) {