Merging external code into ACME using git subtree

This page is for integrators who will be bringing in code or changes to code from an external repository. This page describes the process where the code will be integrated into the ACME repository as a git subtree. There are four possible workflows; Inserting in a new external to ACME as a subtree, replacing original ACME code with an external, replacing modified ACME code with an external, and merging in changes to an external subtree. Each workflow is outlined below followed by sections showing details for various workflow step types.

Insert new external subtree into ACME

Create a branch in which to conduct the work. Be sure to follow the branch naming conventions and other development practices. If the external code is to be completely replaced, create the branch from the commit where the code was last brought into the ACME repository (similar for the procedure for fixing a bug). The branch name should follow the form github-username/component/component.<version>_import.
Add external git repo to ACME.
Test and submit a pull request as defined in the development practices page.

Replace original (unmodified) ACME code with external subtree

Verify that the external code in the ACME repository has been not been modified since the initial commit. If there are changes (non-blank output), follow the 'Replace modified' workflow below.
Create a branch in which to conduct the work. Be sure to follow the branch naming conventions and other development practices. If the external code is to be completely replaced, create the branch from the commit where the code was last brought into the ACME repository (similar for the procedure for fixing a bug). The branch name should follow the form github-username/component/component.<version>_import.
Remove the code from your working copy.
Check to see if the version of the code in the ACME repository has been modified since the initial commit. If there are no changes (blank output), skip to step 6. <always go to step 6?>
Add external git repo to ACME. Now, skip to step 7.
To bring in changes to external repo <fill this in with git subtree merge (and git remote add --tags?)>.
Test and submit a pull request as defined in the development practices page.

Replace modified ACME code with external subtree

Create a branch in which to conduct the work. Be sure to follow the branch naming conventions and other development practices. If the external code is to be completely replaced, create the branch from the commit where the code was last brought into the ACME repository (similar for the procedure for fixing a bug). The branch name should follow the form github-username/component/component.<version>_import.
If the external code is new (no version is currently in ACME repository), skip to step 5.
If the external code is to be completely replaced, remove the code from your working copy. Then, skip to step 5.
Check to see if the version of the code in the ACME repository has been modified since the initial commit. If there are no changes (blank output), skip to step 6. <always go to step 6?>
Add external git repo to ACME. Now, skip to step 7.
To bring in changes to external repo <fill this in with git subtree merge (and git remote add --tags?)>.
Test and submit a pull request as defined in the development practices page.

Merge changes from external into ACME subtree

Create a branch in which to conduct the work. Be sure to follow the branch naming conventions and other development practices. If the external code is to be completely replaced, create the branch from the commit where the code was last brought into the ACME repository (similar for the procedure for fixing a bug). The branch name should follow the form github-username/component/component.<version>_import.
If the external code is new (no version is currently in ACME repository), skip to step 5.
If the external code is to be completely replaced, remove the code from your working copy. Then, skip to step 5.
Check to see if the version of the code in the ACME repository has been modified since the initial commit. If there are no changes (blank output), skip to step 6. <always go to step 6?>
Add external git repo to ACME. Now, skip to step 7.
To bring in changes to external repo <fill this in with git subtree merge (and git remote add --tags?)>.
Test and submit a pull request as defined in the development practices page.

Removing original external code (external code initially installed with ACME v0.0)

    cd <external-subdir>/..

    git rm -r <external-subdir>

Checking for code modification (external code initially installed with ACME v0.0)

    cd <external-subdir>

    git diff --name-only v0.0 .

Add external git repo as new remote

    git remote add -f --tags <external_name> <external_url>

Add code from external to ACME

    cd <ACME_top_level>

    git subtree add --prefix=<external_subdir> --squash <external_repo_URL> <external_branchname>

    git merge -X subtree=the-dir/ $commit