{"id":223,"date":"2012-10-22T15:53:42","date_gmt":"2012-10-22T21:53:42","guid":{"rendered":"http:\/\/lyraphase.com\/wp\/?p=223"},"modified":"2022-03-08T02:32:31","modified_gmt":"2022-03-08T09:32:31","slug":"installing-latest-git-on-ubuntu-with-git-subtree-support","status":"publish","type":"post","link":"https:\/\/mail.lyraphase.com\/wp\/projects\/installing-latest-git-on-ubuntu-with-git-subtree-support\/","title":{"rendered":"Installing latest git on Ubuntu with git-subtree support"},"content":{"rendered":"

Recently I found it necessary to join two git repos together while still maintaining history & future ability to split or rejoin them. \u00a0Enter the ‘git subtree<\/code><\/a>‘ command.<\/p>\n

Because this command is now merged into git-core since\u00a01.7.11, we will need to install the latest git from a PPA<\/a>. \u00a0Note that as of ‘now<\/a>‘, the latest available package from the PPA we will use is 1.8.0, and it currently installs the subtree script to\u00a0\/usr\/share\/doc\/git\/contrib\/subtree<\/code>. However, since the Makefile there expects asciidoc.conf to be in ..\/..\/Documentation\/asciidoc.conf<\/code>, we must checkout the source package & make from there.<\/p>\n

I am using\u00a0Ubuntu 12.04.1 LTS here.<\/p>\n

Installing latest git-core + git-subtree<\/h2>\n

First add the PPA, update & upgrade. \u00a0Then install git packages that are held back by apt. \u00a0Also install asciidoc (optional if you want the manpage).<\/p>\n

\n
sudo add-apt-repository ppa:git-core\/ppa && sudo apt-get update && sudo apt-get -y upgrade && sudo apt-get -y install git git-man git-svn asciidoc<\/code><\/pre>\n<\/blockquote>\n
Next, install the source package & make git-subtree + manpage:<\/p>\n
\n
[ ! -e '~\/src\/git-core' ] && mkdir -p ~\/src\/git-core\r\ncd ~\/src\/git-core && apt-get source git-core\r\ncd ~\/src\/git-core\/git-*\/contrib\/subtree\/\r\n[ -e '\/usr\/lib\/git-core' ] && sed -i -e '\/^libexecdir.*\/ s|\/libexec\/|\/lib\/|' Makefile || echo '\/usr\/lib\/git-core does not exist! Check that your libexec dir exists and reinstall git-subtree'\r\nsudo make prefix=\/usr && sudo make prefix=\/usr install && sudo make prefix=\/usr install-doc<\/code><\/pre>\n<\/blockquote>\n
This may not work for you if you’re not using Ubuntu (your prefix or libexec dir may be different). \u00a0If in doubt, get git-core from upstream<\/a> and build it from there, or install the script to $(git --exec-path)\/git-subtree<\/code> and chmod 755<\/code> it (see Makefile & INSTALL doc in contrib\/subtree<\/code>).<\/p>\n
Now you should be able to use the ‘git subtree<\/code>‘ command. \u00a0For help, run ‘git help subtree<\/code>‘ or ‘man git-subtree<\/code>‘.<\/p>\n
Some helpful examples of git subtree<\/code> in use in the wild:<\/p>\n