git-subtree pull complications

后端 未结 4 1559
深忆病人
深忆病人 2020-12-14 16:49

We have been trying to get git-subtree working on a project (with git version 1.7.9.4) and have run into a bit of a complication. Someone else previous added the subtree wit

4条回答
  •  無奈伤痛
    2020-12-14 17:22

    I've been experiencing the same error Can't squash-merge: 'foo' was never added. with sourcetree 1.7.0 whenever I do a pull on a subtree. However, I believe my case is different because I'm using subdirectories.

    Sourcetree does something as follows:
    git -c diff.mnemonicprefix=false -c core.quotepath=false subtree pull -P dir1\subdir1 --squash remote-repo master

    And obviously, if we were to try it again in Git Bash (Git version 2.6.1.windows.1), it would be:
    git subtree pull -P "dir1\subdir1" --squash remote-repo master

    However that failed. The following also failed although the command syntax is fine:
    git subtree pull -P dir1/subdir1 --squash remote-repo master

    The solution I found to make it work is to use Git Bash with the following command:
    git subtree pull -P "dir1/subdir" --squash remote-repo master

    I guess that there is still some work to be done for Git's command-line processing engine.

提交回复
热议问题