{"action":"closed","number":609,"pull_request":{"url":"https://api.github.com/repos/SnabbCo/snabbswitch/pulls/609","id":44290515,"html_url":"https://github.com/SnabbCo/snabbswitch/pull/609","diff_url":"https://github.com/SnabbCo/snabbswitch/pull/609.diff","patch_url":"https://github.com/SnabbCo/snabbswitch/pull/609.patch","issue_url":"https://api.github.com/repos/SnabbCo/snabbswitch/issues/609","number":609,"state":"closed","locked":false,"title":"deps: Use git subtree instead of submodule","user":{"login":"lukego","id":13791,"avatar_url":"https://avatars.githubusercontent.com/u/13791?v=3","gravatar_id":"","url":"https://api.github.com/users/lukego","html_url":"https://github.com/lukego","followers_url":"https://api.github.com/users/lukego/followers","following_url":"https://api.github.com/users/lukego/following{/other_user}","gists_url":"https://api.github.com/users/lukego/gists{/gist_id}","starred_url":"https://api.github.com/users/lukego/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lukego/subscriptions","organizations_url":"https://api.github.com/users/lukego/orgs","repos_url":"https://api.github.com/users/lukego/repos","events_url":"https://api.github.com/users/lukego/events{/privacy}","received_events_url":"https://api.github.com/users/lukego/received_events","type":"User","site_admin":false},"body":"Switch from `git submodule` to [`git subtree`](https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt) (with squashed history) for tracking dependencies.\r\n\r\nGit subtrees are very similar to submodules. The main difference is that the subtree stores the complete sources for the dependencies (luajit, ljsyscall, pflua) in our repository instead of linking to a separate repository. With the code imported into our repository we can work on it exactly like the rest of our code i.e. you could send a PR that includes changes to Snabb Switch, LuaJIT, pflua, and ljsyscall. Git subtree then provides commands for pulling updates from the upstream projects and also extracting our own changes for submission.\r\n\r\nThe main practical implication is that now if you have an idea for a change to LuaJIT (or another dependency) then you can PR it to `snabbswitch` to get feedback and testing from other people in our community. This did not really work with submodules. I hope this will make it easier to experiment with changes to the other projects that we depend on and start to think of them as read/write rather than read-only.\r\n\r\nThis change does not imply any particular policy for if/when/how we merge changes to LuaJIT/pflua/ljsyscall into the Snabb Switch repo. Changes submitted on PRs do not have to be merged directly into our repository and could instead be tested and reviewed prior to submission to upstream.\r\n\r\nThis is a less extreme alternative to #608.","created_at":"2015-09-05T21:25:16Z","updated_at":"2015-09-14T04:40:22Z","closed_at":"2015-09-14T04:40:22Z","merged_at":null,"merge_commit_sha":"63f4da7c84c5c91bde50248198bcc69dcda7cb97","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/SnabbCo/snabbswitch/pulls/609/commits","review_comments_url":"https://api.github.com/repos/SnabbCo/snabbswitch/pulls/609/comments","review_comment_url":"https://api.github.com/repos/SnabbCo/snabbswitch/pulls/comments{/number}","comments_url":"https://api.github.com/repos/SnabbCo/snabbswitch/issues/609/comments","statuses_url":"https://api.github.com/repos/SnabbCo/snabbswitch/statuses/7f9a3f6f6038d2e0db1ad783a5cc4ab655e78694","head":{"label":"lukego:subtree","ref":"subtree","sha":"7f9a3f6f6038d2e0db1ad783a5cc4ab655e78694","user":{"login":"lukego","id":13791,"avatar_url":"https://avatars.githubusercontent.com/u/13791?v=3","gravatar_id":"","url":"https://api.github.com/users/lukego","html_url":"https://github.com/lukego","followers_url":"https://api.github.com/users/lukego/followers","following_url":"https://api.github.com/users/lukego/following{/other_user}","gists_url":"https://api.github.com/users/lukego/gists{/gist_id}","starred_url":"https://api.github.com/users/lukego/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lukego/subscriptions","organizations_url":"https://api.github.com/users/lukego/orgs","repos_url":"https://api.github.com/users/lukego/repos","events_url":"https://api.github.com/users/lukego/events{/privacy}","received_events_url":"https://api.github.com/users/lukego/received_events","type":"User","site_admin":false},"repo":{"id":13385069,"name":"snabbswitch","full_name":"lukego/snabbswitch","owner":{"login":"lukego","id":13791,"avatar_url":"https://avatars.githubusercontent.com/u/13791?v=3","gravatar_id":"","url":"https://api.github.com/users/lukego","html_url":"https://github.com/lukego","followers_url":"https://api.github.com/users/lukego/followers","following_url":"https://api.github.com/users/lukego/following{/other_user}","gists_url":"https://api.github.com/users/lukego/gists{/gist_id}","starred_url":"https://api.github.com/users/lukego/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lukego/subscriptions","organizations_url":"https://api.github.com/users/lukego/orgs","repos_url":"https://api.github.com/users/lukego/repos","events_url":"https://api.github.com/users/lukego/events{/privacy}","received_events_url":"https://api.github.com/users/lukego/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/lukego/snabbswitch","description":"The Snabb Switch Project","fork":true,"url":"https://api.github.com/repos/lukego/snabbswitch","forks_url":"https://api.github.com/repos/lukego/snabbswitch/forks","keys_url":"https://api.github.com/repos/lukego/snabbswitch/keys{/key_id}","collaborators_url":"https://api.github.com/repos/lukego/snabbswitch/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/lukego/snabbswitch/teams","hooks_url":"https://api.github.com/repos/lukego/snabbswitch/hooks","issue_events_url":"https://api.github.com/repos/lukego/snabbswitch/issues/events{/number}","events_url":"https://api.github.com/repos/lukego/snabbswitch/events","assignees_url":"https://api.github.com/repos/lukego/snabbswitch/assignees{/user}","branches_url":"https://api.github.com/repos/lukego/snabbswitch/branches{/branch}","tags_url":"https://api.github.com/repos/lukego/snabbswitch/tags","blobs_url":"https://api.github.com/repos/lukego/snabbswitch/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/lukego/snabbswitch/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/lukego/snabbswitch/git/refs{/sha}","trees_url":"https://api.github.com/repos/lukego/snabbswitch/git/trees{/sha}","statuses_url":"https://api.github.com/repos/lukego/snabbswitch/statuses/{sha}","languages_url":"https://api.github.com/repos/lukego/snabbswitch/languages","stargazers_url":"https://api.github.com/repos/lukego/snabbswitch/stargazers","contributors_url":"https://api.github.com/repos/lukego/snabbswitch/contributors","subscribers_url":"https://api.github.com/repos/lukego/snabbswitch/subscribers","subscription_url":"https://api.github.com/repos/lukego/snabbswitch/subscription","commits_url":"https://api.github.com/repos/lukego/snabbswitch/commits{/sha}","git_commits_url":"https://api.github.com/repos/lukego/snabbswitch/git/commits{/sha}","comments_url":"https://api.github.com/repos/lukego/snabbswitch/comments{/number}","issue_comment_url":"https://api.github.com/repos/lukego/snabbswitch/issues/comments{/number}","contents_url":"https://api.github.com/repos/lukego/snabbswitch/contents/{+path}","compare_url":"https://api.github.com/repos/lukego/snabbswitch/compare/{base}...{head}","merges_url":"https://api.github.com/repos/lukego/snabbswitch/merges","archive_url":"https://api.github.com/repos/lukego/snabbswitch/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/lukego/snabbswitch/downloads","issues_url":"https://api.github.com/repos/lukego/snabbswitch/issues{/number}","pulls_url":"https://api.github.com/repos/lukego/snabbswitch/pulls{/number}","milestones_url":"https://api.github.com/repos/lukego/snabbswitch/milestones{/number}","notifications_url":"https://api.github.com/repos/lukego/snabbswitch/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/lukego/snabbswitch/labels{/name}","releases_url":"https://api.github.com/repos/lukego/snabbswitch/releases{/id}","created_at":"2013-10-07T13:51:47Z","updated_at":"2015-08-05T12:04:27Z","pushed_at":"2015-09-14T04:35:51Z","git_url":"git://github.com/lukego/snabbswitch.git","ssh_url":"git@github.com:lukego/snabbswitch.git","clone_url":"https://github.com/lukego/snabbswitch.git","svn_url":"https://github.com/lukego/snabbswitch","homepage":"","size":5493,"stargazers_count":4,"watchers_count":4,"language":"Lua","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":1,"forks":1,"open_issues":1,"watchers":4,"default_branch":"master"}},"base":{"label":"SnabbCo:master","ref":"master","sha":"6c0545da8bdba59b8fb197c61b43d95a3773116a","user":{"login":"SnabbCo","id":1913310,"avatar_url":"https://avatars.githubusercontent.com/u/1913310?v=3","gravatar_id":"","url":"https://api.github.com/users/SnabbCo","html_url":"https://github.com/SnabbCo","followers_url":"https://api.github.com/users/SnabbCo/followers","following_url":"https://api.github.com/users/SnabbCo/following{/other_user}","gists_url":"https://api.github.com/users/SnabbCo/gists{/gist_id}","starred_url":"https://api.github.com/users/SnabbCo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SnabbCo/subscriptions","organizations_url":"https://api.github.com/users/SnabbCo/orgs","repos_url":"https://api.github.com/users/SnabbCo/repos","events_url":"https://api.github.com/users/SnabbCo/events{/privacy}","received_events_url":"https://api.github.com/users/SnabbCo/received_events","type":"Organization","site_admin":false},"repo":{"id":4857740,"name":"snabbswitch","full_name":"SnabbCo/snabbswitch","owner":{"login":"SnabbCo","id":1913310,"avatar_url":"https://avatars.githubusercontent.com/u/1913310?v=3","gravatar_id":"","url":"https://api.github.com/users/SnabbCo","html_url":"https://github.com/SnabbCo","followers_url":"https://api.github.com/users/SnabbCo/followers","following_url":"https://api.github.com/users/SnabbCo/following{/other_user}","gists_url":"https://api.github.com/users/SnabbCo/gists{/gist_id}","starred_url":"https://api.github.com/users/SnabbCo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SnabbCo/subscriptions","organizations_url":"https://api.github.com/users/SnabbCo/orgs","repos_url":"https://api.github.com/users/SnabbCo/repos","events_url":"https://api.github.com/users/SnabbCo/events{/privacy}","received_events_url":"https://api.github.com/users/SnabbCo/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/SnabbCo/snabbswitch","description":"Snabb Switch: Simple and fast packet networking","fork":false,"url":"https://api.github.com/repos/SnabbCo/snabbswitch","forks_url":"https://api.github.com/repos/SnabbCo/snabbswitch/forks","keys_url":"https://api.github.com/repos/SnabbCo/snabbswitch/keys{/key_id}","collaborators_url":"https://api.github.com/repos/SnabbCo/snabbswitch/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/SnabbCo/snabbswitch/teams","hooks_url":"https://api.github.com/repos/SnabbCo/snabbswitch/hooks","issue_events_url":"https://api.github.com/repos/SnabbCo/snabbswitch/issues/events{/number}","events_url":"https://api.github.com/repos/SnabbCo/snabbswitch/events","assignees_url":"https://api.github.com/repos/SnabbCo/snabbswitch/assignees{/user}","branches_url":"https://api.github.com/repos/SnabbCo/snabbswitch/branches{/branch}","tags_url":"https://api.github.com/repos/SnabbCo/snabbswitch/tags","blobs_url":"https://api.github.com/repos/SnabbCo/snabbswitch/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/SnabbCo/snabbswitch/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/SnabbCo/snabbswitch/git/refs{/sha}","trees_url":"https://api.github.com/repos/SnabbCo/snabbswitch/git/trees{/sha}","statuses_url":"https://api.github.com/repos/SnabbCo/snabbswitch/statuses/{sha}","languages_url":"https://api.github.com/repos/SnabbCo/snabbswitch/languages","stargazers_url":"https://api.github.com/repos/SnabbCo/snabbswitch/stargazers","contributors_url":"https://api.github.com/repos/SnabbCo/snabbswitch/contributors","subscribers_url":"https://api.github.com/repos/SnabbCo/snabbswitch/subscribers","subscription_url":"https://api.github.com/repos/SnabbCo/snabbswitch/subscription","commits_url":"https://api.github.com/repos/SnabbCo/snabbswitch/commits{/sha}","git_commits_url":"https://api.github.com/repos/SnabbCo/snabbswitch/git/commits{/sha}","comments_url":"https://api.github.com/repos/SnabbCo/snabbswitch/comments{/number}","issue_comment_url":"https://api.github.com/repos/SnabbCo/snabbswitch/issues/comments{/number}","contents_url":"https://api.github.com/repos/SnabbCo/snabbswitch/contents/{+path}","compare_url":"https://api.github.com/repos/SnabbCo/snabbswitch/compare/{base}...{head}","merges_url":"https://api.github.com/repos/SnabbCo/snabbswitch/merges","archive_url":"https://api.github.com/repos/SnabbCo/snabbswitch/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/SnabbCo/snabbswitch/downloads","issues_url":"https://api.github.com/repos/SnabbCo/snabbswitch/issues{/number}","pulls_url":"https://api.github.com/repos/SnabbCo/snabbswitch/pulls{/number}","milestones_url":"https://api.github.com/repos/SnabbCo/snabbswitch/milestones{/number}","notifications_url":"https://api.github.com/repos/SnabbCo/snabbswitch/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/SnabbCo/snabbswitch/labels{/name}","releases_url":"https://api.github.com/repos/SnabbCo/snabbswitch/releases{/id}","created_at":"2012-07-02T09:06:38Z","updated_at":"2015-09-12T17:20:30Z","pushed_at":"2015-09-14T04:40:06Z","git_url":"git://github.com/SnabbCo/snabbswitch.git","ssh_url":"git@github.com:SnabbCo/snabbswitch.git","clone_url":"https://github.com/SnabbCo/snabbswitch.git","svn_url":"https://github.com/SnabbCo/snabbswitch","homepage":"","size":8881,"stargazers_count":1106,"watchers_count":1106,"language":"Lua","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":129,"mirror_url":null,"open_issues_count":36,"forks":129,"open_issues":36,"watchers":1106,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/SnabbCo/snabbswitch/pulls/609"},"html":{"href":"https://github.com/SnabbCo/snabbswitch/pull/609"},"issue":{"href":"https://api.github.com/repos/SnabbCo/snabbswitch/issues/609"},"comments":{"href":"https://api.github.com/repos/SnabbCo/snabbswitch/issues/609/comments"},"review_comments":{"href":"https://api.github.com/repos/SnabbCo/snabbswitch/pulls/609/comments"},"review_comment":{"href":"https://api.github.com/repos/SnabbCo/snabbswitch/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/SnabbCo/snabbswitch/pulls/609/commits"},"statuses":{"href":"https://api.github.com/repos/SnabbCo/snabbswitch/statuses/7f9a3f6f6038d2e0db1ad783a5cc4ab655e78694"}},"merged":false,"mergeable":true,"mergeable_state":"clean","merged_by":null,"comments":3,"review_comments":0,"commits":8,"additions":34263,"deletions":46,"changed_files":517}}