search

sudo-nautilus / FFmpeg-Builds-Win32

Static FFmpeg Auto-Builds For 32-Bit Windows
MIT License
168 stars 22 forks source link

Update repo #7

Closed sudo-nautilus closed 3 years ago

sudo-nautilus commented 3 years ago

Anyone know how to update the repo without opening/running git

pzhlkj6612 commented 3 years ago

Hi. You mean update from the upstream repo (BtbN/FFmpeg-Builds)? Try this: https://github.com/sudo-nautilus/FFmpeg-Builds-Win32/compare/master...BtbN:master .
However, merge with a merge commit, merge after squashing and merge with rebase, none of these three functions can produce a clean commit history (fast-forward), even though you do synchronize the files on your branch. In other words, you cannot completely sync your fork with the upstream through GitHub web UI so far.

sudo-nautilus commented 3 years ago

Thanks, I was playing with git for updating repo which is quite awful. I'll try that

sudo-nautilus commented 3 years ago

Yeah but, What you mean by clean commit history ?

pzhlkj6612 commented 3 years ago

It will not be a fast-forward history, but diverged.
Here is the test result in my repository.

Before:

Upstream: a - b  -  d  - - -  g
                \ /   \     /
                 c     e - f

Mine:     a - b

After:

Upstream: a - b  -  d  - - -  g
                \ /   \     /
                 c     e - f

Mine:     a - b - c' - e' - f'

The resulting files are the same; however, as you can see, the history starting from commit b is completely different after merging. It looks like commits c' , e' and f' are cherry-picked from the corresponding commits in the upstream, and all merge commits ( d and g ) are ignored. It's completely not a fast-forward push (or, not a sync).

Therefore, I think we still need to execute git fetch upstream && git push mine upstream/master:master locally.

sudo-nautilus commented 3 years ago

But we can still try :)

sudo-nautilus commented 3 years ago

Let's see, I made a PR to Xi-PP who forked one of my repo and his/her was updated. Now I remember