Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Cleanup redundant checks #107

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

Merged
qaisjp merged 3 commits into multitheftauto:master from ArranTuna:CleanUp
Dec 30, 2016
Merged

Cleanup redundant checks #107

qaisjp merged 3 commits into multitheftauto:master from ArranTuna:CleanUp
Dec 30, 2016

Conversation

@ArranTuna
Copy link
Collaborator

@ArranTuna ArranTuna commented Dec 30, 2016

Removed all the redundant checks such as if ( pVehicle ) { .... } else m_pScriptDebugging->LogBadPointer ( luaVM, "vehicle", 1 );

Copy link
Collaborator Author

Hmm I don't understand why my setPedStat commits are in this when I created a cleanup branch specifically for the redundant checks.

Copy link
Contributor

4O4 commented Dec 30, 2016
edited
Loading

It is because you commited it to master branch in your previous pull request #106 and you haven't synced your fork's master with upstream (it is recommended to do it before starting any bigger work, details here: https://help.github.com/articles/syncing-a-fork/). The simplest way to fix it is to do interactive rebase in order to drop this single commit from your branch, and then do force push. Pull request should be automatically updated after that. To avoid this complication in the future just remember not to commit to master :)

Good job BTW

Copy link
Contributor

qaisjp commented Dec 30, 2016 via email

Please remove the other commits from this PR.
...
On 2016年12月30日, 12:04 p.m. Paweł K, ***@***.***> wrote: It is because you commited it to master branch in your previous pull request #106 <#106> and you haven't synced your fork's master with upstream (it is recommended to do it before starting any bigger work, details here: https://help.github.com/articles/syncing-a-fork/). The simplest way to fix it is to do interactive rebase in order to drop this single commit from your branch, and then do force push. Pull request should be automatically updated after that. To avoid this complication in the future just remember not to commit to master :) — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#107 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AA4Waj2wd2KbV-P-yp7mfi98jk_h6xViks5rNPM9gaJpZM4LYJRs> .

Copy link
Collaborator Author

I don't understand how to delete those commits from this PR.

Copy link
Contributor

qaisjp commented Dec 30, 2016
edited
Loading

Type git rebase -i HEAD~7 and change the word in front of the commits you want to remove to drop.

Then do git push force

Saved 286 lines by removing redundant if ( pPed )'s and their
LogBadPointer's as this is already handled by argStream.
Weren't many to remove from the server it seems.
Copy link
Collaborator Author

Wow, that actually worked, thank you.

qaisjp reacted with thumbs up emoji

@qaisjp qaisjp merged commit da9bc8c into multitheftauto:master Dec 30, 2016
Copy link
Contributor

qaisjp commented Dec 30, 2016

Thank you! For future commits please write your messages in good form.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /