Skip to content

Conversation

@bitsun
Copy link
Contributor

@bitsun bitsun commented Apr 4, 2019

The bug was obvious, it is triggered when use_scale_orientation is set to false

@alalek
Copy link
Member

alalek commented Apr 13, 2019

Thank you!

Please remove "tabs" from the patch. Indentation is usually 4 spaces.

As a "bugfix" this patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@bitsun bitsun changed the base branch from master to 3.4 April 16, 2019 08:13
@bitsun
Copy link
Contributor Author

bitsun commented Apr 16, 2019

sorry, i am not an active user of git and should have followed the contribution guide earlier.

Still I have followed your instructions:

  1. In order to rebase , i did
    git remote add upstream https://github.com/opencv/opencv_contrib.git

then i got the following by doing git remote -v

origin https://github.com/bitsun/opencv_contrib.git (fetch)
origin https://github.com/bitsun/opencv_contrib.git (push)
upstream https://github.com/opencv/opencv_contrib.git (fetch)
upstream https://github.com/opencv/opencv_contrib.git (push)

then i did git fetch upstream, and got :

remote: Enumerating objects: 40, done.
remote: Counting objects: 100% (40/40), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 51 (delta 32), reused 40 (delta 32), pack-reused 11
Unpacking objects: 100% (51/51), done.
From https://github.com/opencv/opencv_contrib

  • [new branch] 3.4 -> upstream/3.4
  • [new branch] master -> upstream/master
  • [new tag] 3.4.6 -> 3.4.6
  • [new tag] 4.1.0 -> 4.1.0

then i can successfully rebase and update refs/heads/master.

As last step, i want to push the commits git push --force origin https://github.com/bitsun/opencv_contrib.git,

then i got error:
fatal: remote part of refspec is not a valid name in https://github.com/bitsun/opencv_contrib.git

if i do pull now, it seems that it changes the code base to 3.4 branch,
what is wrong?

@alalek
Copy link
Member

alalek commented Apr 16, 2019

The last command should be (use branch name):
git push --force origin master

Previous commands look good.

Copy link
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done! Thank you 👍

@alalek alalek merged commit c7f2e2a into opencv:3.4 Apr 16, 2019
@alalek alalek mentioned this pull request Apr 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants