Why is git missing a subtree?

I just ran git subtree split on my main branch, but the last two entries that are in the master branch are missing in the subtree ( dist branch). I'm not sure what to do here. I have not come across this before. He always worked without problems.

Here's what my github network graph looks like (excluding dist ):

github network graph

From the leading branch I ran git subtree split -P dist -b dist .

If I run git log from the dist branch, it shows that the last commit is 6d1620a . Where are 17c1f31 and 33dfc67 ?

Does anyone know what is going on here?


Details for my scenario

I am using the deployment method used by Yeoman projects. This basically means that I have a shared project folder in which there is a dev (or app ) directory where all development is completed and a dist directory where the project is located (via gulp build process). So for deployment, I just split the dist directory into my own branch and clicked it on a live server.

Which looks something like this:

 gulp git checkout master git merge --no-ff dev git subtree split -P dist -b dist git push 

Also git subtree push -P dist origin dist works.

+6
source share
1 answer

I forgot to start the gulp build process. Because of this, the new commit did not affect the /dist directory.

It makes sense that the commit will not be transferred with a directory that was not affected. But not knowing this behavior ahead of time, I really confused the situation for me.

+4
source

Source: https://habr.com/ru/post/970910/


All Articles