Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor touchups #161

Merged
merged 4 commits into from
May 21, 2017
Merged

Minor touchups #161

merged 4 commits into from
May 21, 2017

Conversation

Freso
Copy link
Member

@Freso Freso commented May 18, 2017

Just some small things I came across and fixed up. Decided to bundle it together in one PR. :)

Depending on how long it takes for @JoeLametta to merge this in, let's see how much I get bundled in. ;)

Freso added 4 commits May 19, 2017 01:05
Make MusicBrainz consistently written as "MusicBrainz" and not
"musicbrainz" or "Musicbrainz".
Doesn't change instances that refer to the Python module or similar.
Some of this seems to be debug code which has been left in, some of it
seems to just be old code that was commented out and never put back in
and probably just forgotten about. Either way, we use git for a reason,
so there's no need for these code snippets to stick around. The code
history can be inspected and old code retrieved that way.
I left the "THOMAS" part in for now, but this seems more like a debug
message than a user facing message to me—but it was also obviously
something @thomasvs left in for himself, so maybe the whole if clause
has no reason to still be there and should just get removed.
@Freso Freso mentioned this pull request May 20, 2017
@JoeLametta
Copy link
Collaborator

Thanks.
Do you prefer I squash merge it or merge it leaving as is?

@Freso
Copy link
Member Author

Freso commented May 21, 2017

I prefer to not have the commits squashed. ;) Even if they're all somewhat related and should probably not cause any issues, it might still be beneficial to refer to specific commits when reviewing why a bit of code looks as it does when doing git blame etc. Squashed merges make this far harder.

@JoeLametta JoeLametta merged commit b331f53 into whipper-team:master May 21, 2017
@JoeLametta
Copy link
Collaborator

I prefer to not have the commits squashed. ;)

Done 😉

@Freso Freso deleted the minor-touchups branch May 30, 2017 21:33
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.

2 participants