https://bugzilla.wikimedia.org/show_bug.cgi?id=36575
Krinkle <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected], | |[email protected], | |[email protected] Component|Special pages |Git/Gerrit Version|1.20-git |unspecified Product|MediaWiki |Wikimedia Target Milestone|1.20.0 release |--- Summary|Gerrit/Gitweb say Error 400 |Special:Version on |when given a link from |en.wikipedia.org shows a |Special:Version on WMF |git commit that isn't in |deployment for MediaWiki |the public repository on |core |gerrit/gitweb --- Comment #1 from Krinkle <[email protected]> 2012-05-07 17:17:19 UTC --- When a git repository pulls new commits from another repository (in this case the clone on wmf pulls from gerrit), it sometimes creates a merge commit. This commit is not in the upstream repository and doesn't make any actual changes. Not sure how it can be prevented, other than to have someone with shell access do: > $ git pull origin <branch> -f (forced pull) and confirm with: > $ git log -n2 compare with https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/core.git;a=log;h=refs/heads/wmf/1.20wmf1 -- Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. You are on the CC list for the bug. _______________________________________________ Wikibugs-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
