Skip to content

Updated Nuked to the latest master#172

Merged
mywave82 merged 13 commits into
adplug:masterfrom
mywave82:nuked4
Mar 26, 2023
Merged

Updated Nuked to the latest master#172
mywave82 merged 13 commits into
adplug:masterfrom
mywave82:nuked4

Conversation

@mywave82

@mywave82 mywave82 commented Mar 9, 2023

Copy link
Copy Markdown
Contributor

Alternative we could use a git submodule?

@Malvineous

Copy link
Copy Markdown
Member

Not too keen on submodules myself, they are a bit of a messy hack. Probably neater to do a squash merge and list which upstream Nuked commit it is being updated to, as we don't really need the whole Nuked commit history repeated again in AdPlug. As long as the Nuked commit hash is present in the AdPlug commit message, it makes it easy for anyone to match it back to the Nuked git history if they wish.

@mywave82

Copy link
Copy Markdown
Contributor Author

If I do a squash, I can add a list of all the hashes from the original project, and add url to where the original project is located.

The hashes currently are unique for adplug since the commit messages are not 100% carbon copy, the original parent are ours, and the files are not 100% the same due to filename being altered.

@Malvineous

Copy link
Copy Markdown
Member

You probably don't need to list all the Nuked commit hashes, if you just write something like "Update to NukedOPL commit abc123" then that should be enough to know what point it's at. Knowing that hash is enough to go back through the NukedOPL history to see what changes were made if anyone ever needs to, since each commit hash includes a pointer to the parent commit.

I don't think it's too important to worry about the AdPlug-specific changes. Anyone who wants to know that can just do a diff between the AdPlug file and the upstream one and that will show all of AdPlug's changes.

@mywave82 mywave82 merged commit 58200aa into adplug:master Mar 26, 2023
dmitrysmagin pushed a commit to dmitrysmagin/adplug that referenced this pull request Mar 30, 2023
Nuked OPL3 is up to date with https://github.com/nukeykt/Nuked-OPL3 f2c98738413f2711321d7a4b6e294d58ea2cdc6d

---------

Co-authored-by: Patryk Obara <patryk.obara@gmail.com>
Co-authored-by: Patryk Obara <dreamer.tan@gmail.com>
Co-authored-by: nukeykt <alexeytf2@gmail.com>
Co-authored-by: Evan Ramos <hendricks266@gmail.com>
Co-authored-by: Kagamiin~ <kingchuxing.trills@aleeas.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants