helpSavannah Administration - Support: sr #109440, temporarily enable...


sr #109440: temporarily enable non-fast-forward commits

Submitted by:  Alex Schroeder <as>
Submitted on:  Mon 08 Jan 2018 06:15:20 PM UTC  
Category:  Source code repositories - developer access Priority:  5 - Normal
Severity:  2 - Minor Status:  Done
Assigned to:  Bob Proulx <rwp> Operating System:  None
Open/Closed:  Closed

Add a New Comment (Rich Markup)

You are not logged in

Please log in, so followups can be emailed to you.


Tue 09 Jan 2018 10:14:16 PM UTC, comment #3: 

Great!  Closing the ticket.

Bob Proulx <rwp>
Site AdministratorIn charge of this item.
Tue 09 Jan 2018 08:19:36 PM UTC, comment #2: 

Thank you very much! I push-forced my changes and that seemed to work, and then I made a regular change and pushed that as well, and all seems to be good.
As far as I am concerned, we can close this support request.
And thanks for your offer to git help. Luckily (I guess) a lot of people seem to have similar problems with git, so there's always plenty of resources on the web for the problems I'm having. :)

Alex Schroeder <as>
Tue 09 Jan 2018 06:20:18 PM UTC, comment #1: 

Hello Alex,

I have opened the oddmuse repository for you to force push to it.  Have have saved off the old master just in case of tragedy.

Just a hint for the future, normally I personally prefer to have a commit that I can roll master back in time to when things were considered good.  Then you can fix things and push an upload on top of it.  That is safest for us as curators of repositories because the rollback point is known.  I looked but couldn't figure it out for oddmuse.  It looks like things are going to have to go back in time quite far.  I'll just say, please be careful out there.

Secondly if you want to discuss any git help please do email us at savannah-help-public AT and the group there would be happy to help with things. It looks like git filter-branch may be the utility for you depending upon what you are trying to do. Certainly pulling wouldn't make things worse but will only merge in the upstream branch. Just don't pull, merge, and then push or the push will publicly commit everything.

Please let me know when you have things back in a happy state.  I will leave the ticket open until then.

Bob Proulx <rwp>
Site AdministratorIn charge of this item.
Mon 08 Jan 2018 06:15:20 PM UTC, original submission:  

My Oddmuse repository needs its history fixed because I committed some changes from an misconfigured system using -email is unavailable- as my email address. This results in other services (we use multiple origins) thinking that some other user (with the same misconfigured email address in their profile) is in fact a contributor to Oddmuse.
I made the necessary changes and wanted to push --force but it wouldn't work for Savannah. Stupidly, I then pulled from the Savannah repo, bringing all the -email is unavailable- commits back, so now the situation is even worse.
What I want to do is undo the merge commit and push --force it all, loosing the commits by -email is unavailable- and keepting the ones by myself,

Alex Schroeder <as>


(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach Files:

No files currently attached


Depends on the following items: None found

Items that depend on this one: None found


Carbon-Copy List
  • -email is unavailable- added by rwp (Posted a comment)
  • -email is unavailable- added by as (Submitted the item)

    Do you think this task is very important?
    If so, you can add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.




    Follow 4 latest changes.

    Date Changed by Updated Field Previous Value => Replaced by
    2018-01-09 rwp StatusIn Progress => Done
        Open/ClosedOpen => Closed
    2018-01-09 rwp StatusNone => In Progress
        Assigned toNone => rwp

    Back to the top

    Powered by Savane 3.6