infra-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Chris Thistlethwaite (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (INFRA-14039) Force-push to gitbox is overwritten by github
Date Tue, 27 Jun 2017 12:58:00 GMT

    [ https://issues.apache.org/jira/browse/INFRA-14039?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16064789#comment-16064789
] 

Chris Thistlethwaite commented on INFRA-14039:
----------------------------------------------

[~wohali] you can do a few things:

1. add your ssh pub key to GitHub https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/.
Then change your git remote via "git remote set-url origin git@github.com:apache/$insertRepoName.git"
2. change your remote to GitBox and push there "git configs set-url origin https://gitbox.apache.org/repos/asf/$insertRepoName.git'

You must also go to https://gitbox.apache.org/setup/ and enable the link between your ApacheId
and GitHub.

As for the force push issue, I'll have to talk to the team a bit, though I do remember an
issue with force push just not the specifics.



> Force-push to gitbox is overwritten by github
> ---------------------------------------------
>
>                 Key: INFRA-14039
>                 URL: https://issues.apache.org/jira/browse/INFRA-14039
>             Project: Infrastructure
>          Issue Type: Bug
>          Components: GitBox, Github
>            Reporter: Benjamin Bastian
>
> Hello! I'm a committer on the CouchDB project and I noticed an issue with github and
gitbox synchronization. The issue is that changes which are force-pushed to gitbox will periodically
be overwritten by changes on github. It can be reproduced by the following:
> 1) create branch "some-branch" on github and gitbox
> 2) push commit A to github and gitbox on the "some-branch" branches
> 3) rewrite the history of "some-branch" on local "some-branch" to be commits B ->
A (via a squash, rebase, etc) and force push to gitbox
> 4) wait for some period of time (anecdotally I noticed this to be about 30 minutes)
> 5) check "some-branch" on gitbox and notice that the force-pushed changes (i.e. commits
B -> A) have been lost and overwritten by "some-branch" on github (i.e. commit A).
> Hope this is helpful! Thanks!



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

Mime
View raw message