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

Bug 366923

Summary:	need to push some non-fast-forward commits
Product:	Community	Reporter:	Jan Sievers <jan.sievers>
Component:	Git	Assignee:	Eclipse Webmaster <webmaster>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	igor, t-oberlies
Version:	unspecified
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:

Description Jan Sievers

2011-12-16 04:25:16 EST

in the new git repo

http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/

while filling the repo with initial commits I accidentally pushed several commits with the wrong user name "d037913" (should be "Jan Sievers" instead).

I fixed the user name in all commits locally with git filter-branch [1] but pushing it fails because it's non fast-forward.

Can you temporarily enable non-fast-forward pushes for me as proposed in [2]?

Thanks
Jan

[1] http://stackoverflow.com/questions/3401732/git-rewrite-author-in-history
[2] https://bugs.eclipse.org/bugs/show_bug.cgi?id=343150#c32

Comment 1 Eclipse Webmaster

2011-12-16 09:07:52 EST

While we're fast we haven't actually rolled this out yet.  However I see that someone (presumably Igor) has been pro-active and has added this to you repo config.  So you don't really need us to 'lift' the ban since your project can do it.

If Igor(or someone on your project with shell access) isn't around/can't be reached let me know and I'll step in.

-M.

Comment 2 Igor Fedorenko

2011-12-16 09:12:10 EST

I did not perform any special configuration on this repository. "initrepo <...>" was all I did. I am happy to make the required configuration changes, but somebody will need to point me at relevant instructions that explain how to do this.

Comment 3 Eclipse Webmaster

2011-12-16 09:20:42 EST

Ok, in that case I've commented out the lines:

[receive]
       denyNonFastforwards = true

In your repo config.

-M.

Comment 4 Jan Sievers

2011-12-19 05:10:38 EST

(In reply to comment #3)
> Ok, in that case I've commented out the lines:
> 
> [receive]
>        denyNonFastforwards = true
> 
> In your repo config.
> 
> -M.

I still can't push:

$ git push -f origin HEAD:master
Username:
Password:
Counting objects: 271, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (99/99), done.
Writing objects: 100% (271/271), 47.93 KiB, done.
Total 271 (delta 63), reused 234 (delta 54)
remote: error: denying non-fast-forward refs/heads/master (you should pull first)

Comment 5 Eclipse Webmaster

2011-12-19 09:46:41 EST

My bad.  I updated the main Tycho repo, not the extras repo.  I've made the change the the correct repo.

-M.

Comment 6 Jan Sievers

2011-12-19 09:55:58 EST

thanks, I was able to force push now.

@Igor, Tobias you will have to rebase.