From 5748db41c2cb7658df6dda4f5546e3717a71f20b Mon Sep 17 00:00:00 2001 From: Jover Date: Mon, 31 Jul 2023 12:59:49 -0700 Subject: [PATCH] README: update vendoring to use `git subrepo` Revisiting our previous decisions in https://github.com/nextstrain/ingest/issues/3 after @victorlin did more testing with the monkeypox repo with `git subtree` in https://github.com/nextstrain/monkeypox/pull/162 and `git subrepo` in https://github.com/nextstrain/monkeypox/pull/164. --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7523ce4..e7c71d7 100644 --- a/README.md +++ b/README.md @@ -9,19 +9,20 @@ Some tools may only live here temporarily before finding a permanent home in ## Vendoring -Nextstrain maintained pathogen repos will use `git subtree` to vendor ingest scripts. +Nextstrain maintained pathogen repos will use [`git subrepo`](https://github.com/ingydotnet/git-subrepo) to vendor ingest scripts. (See discussion on this decision in https://github.com/nextstrain/ingest/issues/3) -First add the latest ingest scripts to the pathogen repo by running: +If you don't already have `git subrepo` installed, follow the [git subrepo installation instructions](https://github.com/ingydotnet/git-subrepo#installation). +Then add the latest ingest scripts to the pathogen repo by running: ``` -git subtree add --prefix ingest/vendored https://github.com/nextstrain/ingest HEAD --squash +git subrepo clone https://github.com/nextstrain/ingest ingest/vendored ``` Any future updates of ingest scripts can be pulled in with: ``` -git subtree pull --prefix ingest/vendored https://github.com/nextstrain/ingest HEAD --squash +git subrepo pull ingest/vendored ``` ## History