Page MenuHomePhabricator

Upon pulling operations/mediawiki-config, uncommited changes are in portals submodule
Closed, ResolvedPublic

Description

When anyone clones operations/mediawiki-config, there are uncommited changes in portals submodule. This should be fixed ASAP. Presumably caused by @Jdrewniak's updating portals actions.

Event Timeline

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptJul 15 2019, 11:30 AM
Urbanecm triaged this task as Unbreak Now! priority.Jul 15 2019, 11:31 AM

This is probably going to frighten deployers coming to deploy1001 as well as other users, boldly triaging as UBN. Feel free to lower prio if you disagree.

Restricted Application added subscribers: Liuxinyu970226, Dereckson. · View Herald TranscriptJul 15 2019, 11:31 AM
Urbanecm renamed this task from Upon clonning operations/mediawiki-config, uncommited changes are in portals submodule to Upon pulling operations/mediawiki-config, uncommited changes are in portals submodule.Jul 15 2019, 11:33 AM

From my local machine:

urbanecm@notebook (master) ~/unsynced/gerrit/operations/mediawiki-config
$ git remote update
Fetching origin
remote: Counting objects: 2496, done
remote: Finding sources: 100% (14/14)
remote: Getting sizes: 100% (7/7)
remote: Compressing objects: 100% (1547374/1547374)
remote: Total 14 (delta 6), reused 5 (delta 3)
Unpacking objects: 100% (14/14), done.
From ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
   35037bd08..3c442ba05  master     -> origin/master
Fetching submodule portals
From https://gerrit.wikimedia.org/r/wikimedia/portals/deploy
   a42d858..d4ddcb7  master     -> origin/master
urbanecm@notebook (master) ~/unsynced/gerrit/operations/mediawiki-config
$ git pull
Fast-forward
 portals                           | 2 +-
 wmf-config/CommonSettings.php     | 5 +++++
 wmf-config/InitialiseSettings.php | 5 ++---
 3 files changed, 8 insertions(+), 4 deletions(-)
M       portals
urbanecm@notebook (master * u=) ~/unsynced/gerrit/operations/mediawiki-config
$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   portals (new commits)

no changes added to commit (use "git add" and/or "git commit -a")
Urbanecm closed this task as Resolved.Jul 15 2019, 1:04 PM
Urbanecm assigned this task to Jdrewniak.

Fixed! Thanks @Jdrewniak