Skip to main content

Synced commit on the other upstream

A pull merges from the synced commit, so it needs that commit, and it fetches only the upstream it pulls from. Here the monorepo last pulled a release from the original, then made the company fork its default upstream, and the fork doesn't have the release. In a fresh clone, a pull from the fork can't find the synced commit, and says so. git splice fetch fetches every upstream, and the next pull merges.

Output​

setup.bash builds this state:

$ build_scenario scenario_several_upstreams https://git.example.com/lib.git

The original moves on, and the monorepo pulls the release r:

$ seed_bare_repo "$UPSTREAM" "original release" main release.txt
$ git splice pull vendor/a
ok   vendor/a fetched (main moved bde4164..3fd09f0)
ok   vendor/a: pulled 3fd09f0

Then it works with the fork:

$ git config --file vendor/a/.splice upstream.fork.url \
>   https://git.example.com/company/lib.git
$ git config --file vendor/a/.splice splice.default-upstream fork
$ git commit -q -m "vendor/a: work with the company fork" -- vendor/a/.splice

The monorepo's a, x and c, H at c; the lane vendor/a/ split in two: origin with r on top of k, which is U(H), R and its main; fork with f on top of k, which is T and its main. Only origin has r

a (add vendor/a) cloned k (seed) from the original, x pulled the release r (original release), and c (vendor/a: work with the company fork) made the fork the default upstream. The fork's main, T, is f (fork patch) on top of k. The synced commit U(H) is r, the original's main, on its side only.

In a fresh clone​

$ git clone -q --no-local . ../fresh
$ cd ../fresh &&
>   git config user.name Test &&
>   git config user.email test@example.com

The clone doesn't have the synced commit r:

$ git cat-file -e "$(git config --file vendor/a/.splice splice.commit)"
[1]

A pull fetches only the fork, which lacks r:

$ git splice pull vendor/a
ok   vendor/a fetched from fork
!!   vendor/a: its synced commit 3fd09f0 isn't on fork, the upstream this pull fetched -- 'git splice fetch vendor/a' fetches every upstream
!!   Failed: vendor/a
[1]

fetch fetches every upstream, the original with r too:

$ git splice fetch vendor/a
ok   vendor/a fetched from origin
ok   vendor/a fetched from fork

Now the pull joins the fork's patch with r:

$ git splice pull vendor/a
ok   vendor/a fetched from fork
ok   vendor/a: pulled 9bf41c7