How do I import a third party lib into git?

Question

I'm looking at how to import some third part code into a git repository. The third party code is the "stm32f10x_stdperiph_lib" that is provided by ST.

The lib is actually a bunch of normal c-files (and header-files) that you just include and build with when you do a STM32 project.

The problem is that they only provide it as a zip-file and they do release new versions, so I would like to add more control.

So my plan is to write a little script that does this:

1. unzip
2. grab some of the files (I don't need all the files in the zip)
3. import the selected files into a git repository

My problems start at the last step, how do I import and overwrite the old files with the new ones (and remove files that are no longer included)?

Answer 1

What you're looking for is a "vendor branch". Assuming you want to work on this code and merge the vendor's updates with your own patches, here's how you make that easy.

git checkout -b vendor    # create a vendor branch and check it out

That's a one time thing. The vendor branch and its ONLY going to contain updates from the 3rd party vendor. You never do work in the vendor branch, it contains a clean history of the vendor's code. There's nothing magic about the name "vendor" its just my terminology hold over from CVS.

Now we'll put the latest version from the vendor in there.

find . -not -path *.git* -and -not -path . -delete  # delete everything but git files
dump the 3rd party code into the project directory  # I'll leave that to you
git add .                              # add all the files, changes and deletions
git commit -a -m 'Vendor update version X.YY'   # commit it
git tag 'Vendor X.YY'                  # optional, might come in handy later

We delete everything first so that git can see things the vendor deleted. git's ability to see deletions and guess moved files makes this procedure far simpler than with Subversion.

Now you switch back to your development (I'm presuming master) and merge in the vendor's changes.

git checkout master
git merge vendor

Deal with any conflicts as normal. Your patched version is now up to date with the vendor. Work on master as normal.

Next time there's a new version from the vendor, repeat the procedure. This takes advantage of git's excellent merging to keep your patches up to date with vendor changes.