将 Git 提交合并到具有不同目录的另一个存储库中

Question

We have two Git repositories "installer" and "software" with both containing an Apache Tomcat server:

installer/common/tomcat
software/dist/tomcat

I update Tomcat in "installer" and commit the changes.

When we used SVN I just used to do an svn merge --accept=tf src@rev1 src@rev2 . where src is the URL of the "installer" repo including common/tomcat path and rev1 and rev2 are the revision just before and after the update. The . is the dist/tomcat directory from "software".

The changes affect mostly text files and *.jar files.

I've been trying all day long to do the equivalent with Git and so far I think, creating a patch from "installer" about that single commit and applying it to "software" is the appropriate way, eg

/installer$ git format-patch --binary -1 <commit>
/software$ git am -p2 --directory='dist' <patch file>

I use -p2 to strip leading directories (which is 'a/common') and add the proper target directory from "software". I tried with "git diff" and "git apply" but only with varying error messages. Sometimes there are issues with text files and changes are not applied. Sometimes Git complains about the JAR files:

error: patch not applied to <file> which does not match the current contents

How can I achieve this and make Git stop complaining and just apply the patch? Isn't there a parameter like --accept=tf like in SVN?

Answer 1

One way to carry it out is through using a different branch, say tomcat , created from installer . In tomcat rename common/tomcat to dist/tomcat there. When you want to bring over a change from installer to software , you first cherry-pick it into tomcat (git should be able to see the renamed files and adjust paths accordingly) and then you can create the patch from there which should work fine in software .