[jira] [Commented] (INFRA-7018) Error merging sub-tree and pushing to Usergrid Git repo

["Tony Stevenson (JIRA)" <ji...@apache.org>]

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

Tony Stevenson commented on INFRA-7018:
---------------------------------------

I am far from a git expert, but this is likely tripping a sanity filter we have. If this is performing a re-base or something like that it will trip over.  

I'll leave the commenting to someone else now, but I dont expect it to be an issue with the setup, perhaps more with the action being not allowed. 

> Error merging sub-tree and pushing to Usergrid Git repo
> -------------------------------------------------------
>
>                 Key: INFRA-7018
>                 URL: https://issues.apache.org/jira/browse/INFRA-7018
>             Project: Infrastructure
>          Issue Type: Bug
>            Reporter: David Johnson
>            Priority: Blocker
>
> I'm following the steps described here
> https://help.github.com/articles/working-with-subtree-merge to merge the
> Usergrid code from GitHub to the ASF Git repo, and everything goes well
> locally but when I try to push to origin I get this error from git:
> Counting objects: 5, done.
> Delta compression using up to 8 threads.
> Compressing objects: 100% (3/3), done.
> Writing objects: 100% (3/3), 480 bytes | 0 bytes/s, done.
> Total 3 (delta 1), reused 0 (delta 0)
> remote: Error: list index out of range
> To https://git-wip-us.apache.org/repos/asf/incubator-usergrid.git
>  ! [remote rejected] master -> master (pre-receive hook declined)
> error: failed to push some refs to '
> https://git-wip-us.apache.org/repos/asf/incubator-usergrid.git'
> Because of the part about the "pre-receive hook" and the Python-looking "Error: list index out of range" message, I suspect there is something about he ASF Git setup that is broken or not setup properly for the Usergrid repo.
> Can INFRA offer any help here?
> Here are the steps I took locally to try to merge the Usergrid code base ito the Apache Git repo:
>     git clone https://git-wip-us.apache.org/repos/asf/incubator-usergrid.git
>     cd incubator-usergrid
>     git remote add -f usergrid https://github.com/usergrid/usergrid.git
>     git merge -s ours --no-commit usergrid/master
>     git read-tree --prefix=usergrid/ -u usergrid/master
>     git commit -m "Subtree merged in usergrid"
>     git mv usergrid/* .
>     git rm -rf usergrid
>     git commit -m "Move usergrid files up one level"
> Can INFRA recommend any other approaches to this initial import of Usergrid code?



--
This message was sent by Atlassian JIRA
(v6.1#6144)