The issue has been resolved. The problem was that force-pushing the asf-site branch breaks gitpubsub. If a mistake is made in the asf-site branch, it should be fixed with *git revert* instead of *git push -f *or *git reset*.
On Fri, Mar 25, 2016 at 5:48 PM, William Marshall <[email protected]> wrote: > I've created an INFRA issue for the website: > https://issues.apache.org/jira/browse/INFRA-11548 > > On Thu, Mar 24, 2016 at 5:25 PM, Katherine Marsden <[email protected]> > wrote: > >> On 3/24/2016 4:21 PM, William Marshall wrote: >> >>> Could just deleting and recreating the branch work? >>>>> >>>> That's what I'm trying now. >>>> >>> >> I suspect if you do that, we will need to have INFRA reset our working >> copy. See this old issue when someone created a new branch. >> https://issues.apache.org/jira/browse/INFRA-9886 >> >> To be very clear, I'm going to try making a new orphan branch, and copying >>> over all of the changesets from the asf-site tree. So something like: >>> >>> git checkout --orphan newTree >>> >>> git cherry-pick <commit 1 from asf-site branch> >>> ... >>> git cherry-pick <commit n from asf-site branch> >>> >>> git checkout asf-site >>> git reset --hard newTree >>> git push -f origin asf-site >>> >>> This way, we can preserve commit history. >>> >> I don't know enough about git to say if that is the right thing. >> Probably commit history on asf-site is not so important. >> >> >> >
