Re: Git commit disappeared
| From: | Derick Rethans | Date: | Wed, 21 Jan 2015 11:30:15 +0000 |
| Subject: | Re: Git commit disappeared | ||
| References: | 1 | Groups: | php.webmaster |
| Request: | Send a blank email to php-webmaster+get-20592@lists.php.net to get a copy of this message | ||
On Wed, 21 Jan 2015, Maciej Sobaczewski wrote:
> "Hello,
>
> sorry for a stupid question, but after I removed my fork, merged commits seem
> to disappear oO Am I wrong about how pull requests work or something very
> strange happened? Or has it nothing to od with repository removal and it was
> somehow intended?
>
> Thanks."
>
> https://github.com/php/web-pres2/pull/1
>
> The only explanation which comes to my mind would be cherrypicking + git push
> --force, but I see no sense in doing such a thing.
Yeah, I didn't do that either.
> Note: while those commits (at least at this particular moment) does still
> exist on Github
> (https://github.com/php/web-pres2/commit/bd23d3d3ca7d20262d94bf054e988a73f0d51c2e),
> they are not present in actual repo
> (http://git.php.net/?p=web/pres2.git;a=commit;h=bd23d3d3ca7d20262d94bf054e988a73f0d51c2e),
> so it is probably a cache.
>
> Is anyone able to explain this? Thanks in advance.
It's odd. I did commit to web-pres2 to remove some files that shouldn't
be there. But I checked, and it's really to git.php.net :S But if there
is a commit on github, and not on git.php.net, that indicates I must
have committed it to the first one. I'll remove that commit (and force
push it) - hopefully that won't break things. Make a backup though :-)
I'll then redo the commit at git.php.net. Would that work?
> PS: Derick, I've CC'ed you, because I'm almost sure that whole
> situation happened after your commit, so you should be able to confirm
> or deny forced push case.
I didn't force push, that's for sure.
cheers,
Derick