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

Another check for invalid row parameter. #117

Closed
wants to merge 6 commits into from

Conversation

vranki
Copy link

@vranki vranki commented Sep 15, 2014

Don't crash if invalid row is given. Not tested properly, but looks trivial.

@pvuorela
Copy link
Contributor

Quite a lot of commits for few changed lines. Suggest rebasing&squashing. On cosmetics side, doesn't follow if () convention.

@thp
Copy link
Contributor

thp commented Jan 29, 2015

@vranki do you think you can rework it with the feedback from Pekka?

@vranki
Copy link
Author

vranki commented Jan 29, 2015

Yep, I'll do it. Hopefully next week.

@vranki
Copy link
Author

vranki commented Feb 24, 2015

I looked at this and rebase & squash would be a pretty complex job as this is done in master branch and includes some merge conflict fixes. I suggest you just accept the pull request and I'll try to remember squashing next time. The end result should work anyway.

@chriadam
Copy link

Alternative is to just do:

git diff nemomobile/master > ../diff1.diff
git reset --hard nemomobile/master
git apply ../diff1.diff
git commit -a -m "Check rows to avoid crash if invalid row is given."
git push --force vranki master:master

That will ensure just a single commit, on top of the latest history.

@thp
Copy link
Contributor

thp commented Feb 27, 2015

Or git rebase -i nemomobile/master and reorder/squash/fixup commits.

@thp
Copy link
Contributor

thp commented Apr 7, 2015

@vranki I've rebased your commits here: https://github.com/nemomobile/nemo-qml-plugin-contacts/tree/invalid-row-parameter-check

Please have a look if these are the changes you want and if so, we can get this merged.

@vranki
Copy link
Author

vranki commented Apr 9, 2015

LGTM

@thp
Copy link
Contributor

thp commented Apr 14, 2015

Continued here: #121

@thp thp closed this Apr 14, 2015
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.

4 participants