You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ti...@lycos.com on 2014/12/24 01:49:05 UTC
problem to git reset hash at git-wip-us.apache.org/repos/asf
I need a help with reseting the master
git-wip-us.apache.org/repos/asf/surefire.
I did like this:
git reset --hard f7558cb8ff087d5aaf114ec291babac31896bef3
git commit
git push -u https://git-wip-us.apache.org/repos/asf/maven-surefire.git
master
GitHub is telling me:
remote: Rewinding refs/heads/master is forbidden.
Is there another way to reset the HEAD to another hash?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: problem to git reset hash at git-wip-us.apache.org/repos/asf
Posted by tibor17 <ti...@lycos.com>.
Yes I supposed last few commits won't be able undo other way. Next time this
will not happen, we will make "safe" commitments first.
What branches were introduced?
The apache branch had master and surefire-954-test only.
The whole problem was with maven-release-plugin:2.2.1 and some other with
SSLv3 and not-generated MD5 in Nexus repository. We were unable to deploy
release versions. Thus the team decided to use the latest maven-parent and
apache POM which means that now we use maven-release-plugin:2.5.1 working
with git client 1.9.5.
Since we have quite urgent fixes in surefire I will call a vote.
The people reported next two major issues only, so we have 98 major, and
after surefire 2.19 the number of issues should decrease again. Then we will
have let's say more stable code and API to prepare for surefire 3.0. Since
the rest of the issues are a lot of features, after fixing them in 2.19, we
will get better imagination of what API the people would like to customize
in 3.0 instead of plugin's pom configuration.
-----
BR, tibor17
--
View this message in context: http://maven.40175.n5.nabble.com/problem-to-git-reset-hash-at-git-wip-us-apache-org-repos-asf-tp5820756p5820822.html
Sent from the Maven Developers mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: problem to git reset hash at git-wip-us.apache.org/repos/asf
Posted by Kristian Rosenvold <kr...@gmail.com>.
I see you have pushed some "interesting" committs to surefire master @
apache. These are a permanent part of history, and cannot be undone.
You also pushed a few "interesting" branches, which I took the liberty
of deleting, sicne they were pointing to existing history.
In general, I find that using "gitk --all" is a very good tool to try
to understand what's going on when I'm confused.
K
2014-12-24 11:41 GMT+01:00 Kristian Rosenvold <kr...@gmail.com>:
> When you do the git reset --hard command you basically move your local
> "master" branch back somewhere else in history. If you make a commit
> at the point, you will not be able to push to apache, since it refuses
> to rollback history.
>
> To get out of this situation you need to do git merge origin/master
> before pushing (assuming git-wip-us.apache.org is origin)
>
> Kristian
>
>
> 2014-12-24 1:49 GMT+01:00 <ti...@lycos.com>:
>> I need a help with reseting the master
>> git-wip-us.apache.org/repos/asf/surefire.
>> I did like this:
>> git reset --hard f7558cb8ff087d5aaf114ec291babac31896bef3
>> git commit
>> git push -u https://git-wip-us.apache.org/repos/asf/maven-surefire.git
>> master
>> GitHub is telling me:
>> remote: Rewinding refs/heads/master is forbidden.
>> Is there another way to reset the HEAD to another hash?
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: problem to git reset hash at git-wip-us.apache.org/repos/asf
Posted by Kristian Rosenvold <kr...@gmail.com>.
When you do the git reset --hard command you basically move your local
"master" branch back somewhere else in history. If you make a commit
at the point, you will not be able to push to apache, since it refuses
to rollback history.
To get out of this situation you need to do git merge origin/master
before pushing (assuming git-wip-us.apache.org is origin)
Kristian
2014-12-24 1:49 GMT+01:00 <ti...@lycos.com>:
> I need a help with reseting the master
> git-wip-us.apache.org/repos/asf/surefire.
> I did like this:
> git reset --hard f7558cb8ff087d5aaf114ec291babac31896bef3
> git commit
> git push -u https://git-wip-us.apache.org/repos/asf/maven-surefire.git
> master
> GitHub is telling me:
> remote: Rewinding refs/heads/master is forbidden.
> Is there another way to reset the HEAD to another hash?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org