{"thread":{"id":"36573","subject":"git subtree pull same remote different prefix problem","startedAt":"2014-05-03T08:44:35Z","lastAt":"2014-05-03T08:44:35Z","messageCount":1,"participants":["Asmodehn Shade"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"240617","messageId":"CANH8SB-wUscFS4rsmfm2O9N1uEKBf+vC3y-H5_qQRmEmOprGEQ@mail.gmail.com","threadId":"36573","inReplyTo":null,"subject":"git subtree pull same remote different prefix problem","fromName":"Asmodehn Shade","fromEmail":"asmodehn@gmail.com","sentAt":"2014-05-03T08:44:35Z","receivedAt":"2014-05-03T08:44:35Z","isPatch":false,"sender":{"key":"asmodehn@gmail.com","avatar":null},"body":"Hello,\n\nI am currently using git subtree in a project :\nhttps://github.com/asmodehn/wkcmake\n\nThis is basically a set of cmake scripts that help writing convention\nbased (folder hierarchy, etc.) cmake builds.\n\nMy setup is that \"master\" has the set of scripts needed. and many\nother branches (\"test\" and \"tests/*\" most notably) have tests projects\nfor these scripts. Travis run build of these to check if the build\nsetup works as expected.\n\nThe \"test\" branch has a hierarchy of dependent projects (ProjectA,\nProjectB, ProjectC) , all using the wkcmake scripts to build.\n\nSo I am using git-subtree to pull and push  \"ProjectA/CMake\"\nProjectB/Custom CMake\" \"ProjectC/CMake\".\n\nI had enough trouble with push to stop using it( merge not happening\nas I thought it would ). Not sure if I am to blame or not for these...\nAnyway now, after a commit into the test branch, I instead split the\nCMake subtree to a new branch, and merge in manually back to master.\nThat seems to work okay so far.\n\nHowever I realized that when I do :\n git subtree pull -P ProjectA/CMake git@github.com:asmodehn/\nwkcmake.git origin master\n git subtree pull -P \"ProjectB/Custom CMake\"\ngit@github.com:asmodehn/wkcmake.git origin master\n git subtree pull -P ProjectC/CMake\ngit@github.com:asmodehn/wkcmake.git origin master\n\nI get only one merge commit into the \"test\" branch. All the other\nsubtree pull returns \"Already up to date\" even though the content of\nthe working directory in the prefix passed is NOT uptodate.\n\nThe possible behavior that I could understand would be :\n- One subtree pull update all prefixes, with only one merge commit,\nand the prefix doesnt really matter anymore ( could be problematic...\n)\n- Each subtree pull update the appropriate prefix with one merge commit each.\n\nSo I am curious : I this a scenario that subtree doesnot support ?\nAm I using it wrong ?\nIs it a current limitation/bug of subtree that is on the roadmap to be\naddressed sometime in the future ?\n\nThanks a lot for the help.\n--\nAlexV\n"}]}