Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 347707

Summary:	Orion Git Repo is out-of-date and hook is preventing us from repairing it
Product:	Community	Reporter:	Simon Kaegi <simon_kaegi>
Component:	Git	Assignee:	Eclipse Webmaster <webmaster>
Status:	RESOLVED FIXED	QA Contact:
Severity:	blocker
Priority:	P3	CC:	aniefer, bokowski, john.arthorne, Szymon.Brandys, tomasz.zarna
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Simon Kaegi

2011-05-30 18:04:13 EDT

The outage has left our team (Orion) in bad shape in that our local git repos are now ahead of git.eclipse.org and we cannot push our changes because of the hook.

When I push org.eclipse.orion.client I get...

$ git push
Password:
Counting objects: 150, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (92/92), done.
Writing objects: 100% (104/104), 68.66 KiB, done.
Total 104 (delta 59), reused 0 (delta 0)
remote:
remote: error: git.eclipse.org does not know this committer,
remote:   or this is not you: Szymon.Brandys@pl.ibm.com.
remote: error: git.eclipse.org does not know this committer,
remote:   or this is not you: malgorzata.tomczyk@pl.ibm.com.
remote: error: git.eclipse.org does not know this committer,
remote:   or this is not you: mamacdon@ca.ibm.com.
remote:
remote: denied: You (simon_kaegi@ca.ibm.com) cannot push changes that were not committed by you. Please fix your repository, and see http://wiki.eclipse.org/Git for information on configuring your Git environment.
remote:
remote: error: hook declined to update refs/heads/master
To ssh://skaegi@git.eclipse.org/gitroot/e4/org.eclipse.orion.client.git
 ! [remote rejected] master -> master (hook declined)
error: failed to push some refs to 'ssh://skaegi@git.eclipse.org/gitroot/e4/org.eclipse.orion.client.git'


--

I have 9 commits in my local-repo that I would/could push to get us back to where we were at 11:38am today.

$ git log
commit 7b02d718be57a1eb8a5988b003b4294d940959d8
Author: skaegi <simon_kaegi@ca.ibm.com>
Date:   Mon May 30 11:38:56 2011 -0400

    adding plugin registry dependency to manage-users page

commit 9c9439dbb3e177915ba9fd806453967c574791a8
Author: Mark Macdonald <mamacdon@ca.ibm.com>
Date:   Mon May 30 09:54:07 2011 -0400

    Fix styling on 'edit site' page

commit ad587564f2f71c0e8d8c894442ec4d02c703cdad
Merge: cc7ad21 1838671
Author: Szymon Brandys <Szymon.Brandys@pl.ibm.com>
Date:   Mon May 30 13:51:59 2011 +0200

    Merge commit '18386713069a290cd6537288cffaf436327656f8'

commit cc7ad21f68d4281f32cc6db8233498d315448dfd
Author: Szymon Brandys <Szymon.Brandys@pl.ibm.com>
Date:   Mon May 30 13:47:25 2011 +0200

    bug 347126 - [client] Checkout action for remote tracking branches
    https://bugs.eclipse.org/bugs/show_bug.cgi?id=347126

commit 18386713069a290cd6537288cffaf436327656f8
Merge: 67b9874 8e4cc52
Author: Malgorzata Janczarska <malgorzata.tomczyk@pl.ibm.com>
Date:   Mon May 30 13:25:14 2011 +0200

    Merge branch 'master' of ssh://mjanczarska@dev.eclipse.org/gitroot/e4/org.eclipse.orion.client.git

commit 67b987432dd1cd7ea73aeef34b44857d75655cfd
Author: Malgorzata Janczarska <malgorzata.tomczyk@pl.ibm.com>
Date:   Mon May 30 13:21:43 2011 +0200

     Bug 347631 - [client][git]Git log error when repository is in subfolder

commit 8e4cc521f931e813be1674296591e749cb6f64ea
Author: skaegi <simon_kaegi@ca.ibm.com>
Date:   Mon May 30 02:03:07 2011 -0400

    Updating manage-users page to use requirejs

commit 561411c6dbb210007846e370050a2796070e4495
Author: skaegi <simon_kaegi@ca.ibm.com>
Date:   Mon May 30 01:36:37 2011 -0400

    Fixing the edit site page - porting dojox grid over to requirejs and fixing our widgets

commit dd207166f6931e46b27b93a123309c9c2bdd0ea1
Author: skaegi <simon_kaegi@ca.ibm.com>
Date:   Sun May 29 23:46:34 2011 -0400

    removing orion component folder used during requirejs migration

--

Is there some way we can push these changes?

Comment 1 Tomasz Zarna

2011-05-31 06:17:43 EDT

*** Bug 347752 has been marked as a duplicate of this bug. ***

Comment 2 Szymon Brandys

2011-05-31 06:21:01 EDT

Bumping up the severity. We can't continue pushing changes until it is resolved.

Comment 3 Denis Roy

2011-05-31 06:25:06 EDT

I've removed the hook.  Please let me know when you're done so I can out it back.

Comment 4 Tomasz Zarna

2011-05-31 06:29:48 EDT

(In reply to comment #3)
> I've removed the hook.  Please let me know when you're done so I can out it
> back.

Could you do the same thing for org.eclipse.orion.server? I will push the changes.

Comment 5 Denis Roy

2011-05-31 06:31:17 EDT

Yes, done.

Comment 6 Szymon Brandys

2011-05-31 06:33:11 EDT

(In reply to comment #3)
> I've removed the hook.  Please let me know when you're done so I can out it
> back.

dev.eclipse.org/gitroot/e4/org.eclipse.orion.client.git is now up-to-date.

Comment 7 Szymon Brandys

2011-05-31 06:36:40 EDT

Both repos are fixed. We may close the bug.

Comment 8 Denis Roy

2011-05-31 09:42:30 EDT

(In reply to comment #7)
> Both repos are fixed. We may close the bug.

Could you post up "how" you fixed the repos, since others may encounter similar problems as well?  See bug 347763.

Thanks!

Comment 9 Szymon Brandys

2011-05-31 09:59:17 EDT

(In reply to comment #8)
> (In reply to comment #7)
> > Both repos are fixed. We may close the bug.
> 
> Could you post up "how" you fixed the repos, since others may encounter similar
> problems as well?  See bug 347763.
> 
> Thanks!

We had all commits in our local branch 'master'. When you removed the hook, we were able to push them to the repo.

Comment 10 Andrew Niefer

2011-05-31 12:59:03 EDT

(In reply to comment #8)
> (In reply to comment #7)
> > Both repos are fixed. We may close the bug.
> 
> Could you post up "how" you fixed the repos, since others may encounter similar
> problems as well?  See bug 347763.
> 
> Thanks!

I believe this was just we had local clones that were ahead of the master by a set of commits that came from a bunch of different people.  Some of us had pulled shortly before the servers went down, master came back at an older point missing these commits.  This is fixed just by pushing the changes to bring the master back up to date.  The thing preventing this was the hook enforcing the commiters:

>remote: error: git.eclipse.org does not know this committer,
>remote:   or this is not you: Szymon.Brandys@pl.ibm.com.
>remote: error: git.eclipse.org does not know this committer,
>remote:   or this is not you: malgorzata.tomczyk@pl.ibm.com.
>remote: error: git.eclipse.org does not know this committer,
>remote:   or this is not you: mamacdon@ca.ibm.com.

Comment 11 John Arthorne

2011-06-10 09:27:53 EDT

Webmaster / Denis: did you re-enable the hook? I was just able to push someone else's commit which I think this hook should prevent.

Comment 12 Denis Roy

2011-06-10 11:03:11 EDT

(In reply to comment #11)
> Webmaster / Denis: did you re-enable the hook? I was just able to push someone
> else's commit which I think this hook should prevent.

sha?