Hi all, My group is following a remote git repository, and we have some custom private patches, our development is on top of our custom patches. So our ideal work flow is to 1. Clone the upstream to a local repo (for our reference of upstream work) 2. Clone the local repo to an StGit repo, with our custom patches 3. StGit repo is fetched with git --bare fetch (for git-web) 3. All of us clone from git-web repo and hack on individual branches 4. Once a feature is locally developed and tested, it's added to StiGit repo as a patch. 5. We periodically pull from upstream to local StGit repo for updates When I try this work flow, changes made in Stgit is not getting reflected in the git-web repository git --bare fetch ../stg_branch my_branch02:my_branch02 my_branch02:my_branch02 my_branch01:my_branch01 master:master remote: Generating pack... remote: Done counting 33 objects. Result has 21 objects. Deltifying 21 objects... 100% (21/21) donemote: ne Total 21 (delta 11), reused 0remote: (delta 0) Unpacking 21 objects... 100% (21/21) done * refs/heads/my_branch02: not updating to non-fast forward branch 'my_branch02' of ../stg_branch old...new: 64609a4...322d3bf * refs/heads/my_branch01: fast forward to branch 'my_branch01' of ../stg_branch old..new: 35a22b1..2fb9b65 * refs/heads/master: fast forward to branch 'master' of ../stg_branch old..new: 464a9b4..1754e61 It says * refs/heads/my_branch02: not updating to non-fast forward branch 'my_branch02' of ../stg_branch my_branch02 is the StGit managed branch from stg_branch, other normal branchs are getting merged. Since this is StGit managed, fast forward merge is not possible, I guess. So how can I pull in the StGit managed changes to web.git repository? I have made a script of the testing I have done, and attaching it as a file. It can be run as such in a directory, where it will create some git and stgit repositories, illustrating the problem. In the script upstream is my upstream, stg_branch is stgit managed branch, web.git is for git-web, my-project is cloned from web.git and my-project-stgit is cloned from stg_branch. raj
Attachment:
stgit_test-1.sh
Description: Bourne shell script
