Skip to content

Another check for invalid row parameter.#117

Closed
vranki wants to merge 6 commits into
nemomobile:masterfrom
vranki:master
Closed

Another check for invalid row parameter.#117
vranki wants to merge 6 commits into
nemomobile:masterfrom
vranki:master

Conversation

@vranki

@vranki vranki commented Sep 15, 2014

Copy link
Copy Markdown

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

@pvuorela

Copy link
Copy Markdown
Contributor

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

@thp

thp commented Jan 29, 2015

Copy link
Copy Markdown
Contributor

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

@vranki

vranki commented Jan 29, 2015

Copy link
Copy Markdown
Author

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

@vranki

vranki commented Feb 24, 2015

Copy link
Copy Markdown
Author

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
Copy Markdown

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

thp commented Feb 27, 2015

Copy link
Copy Markdown
Contributor

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

@thp

thp commented Apr 7, 2015

Copy link
Copy Markdown
Contributor

@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

vranki commented Apr 9, 2015

Copy link
Copy Markdown
Author

LGTM

@thp

thp commented Apr 14, 2015

Copy link
Copy Markdown
Contributor

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