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

Adding option ignore_unmapped to GeoDistanceQuery #2388

Merged
merged 1 commit into from
Jan 15, 2024

Conversation

l-trotta
Copy link
Contributor

Fixes issue 2387

Copy link
Member

@swallez swallez left a comment

Choose a reason for hiding this comment

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

LGTM! Please add the "backport 8.12" and "backport 7.17" labels before merging so that the backport action kicks in.

@l-trotta l-trotta merged commit d7b42a9 into main Jan 15, 2024
9 checks passed
@l-trotta l-trotta deleted the issues-2387-geodistance-missing-ignore-unmapped branch January 15, 2024 13:54
Copy link
Contributor

The backport to 7.17 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.17 7.17
# Navigate to the new working tree
cd .worktrees/backport-7.17
# Create a new branch
git switch --create backport-2388-to-7.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d7b42a961806190aedb9692fd3a562ea0ebe1702
# Push it to GitHub
git push --set-upstream origin backport-2388-to-7.17
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.17

Then, create a pull request where the base branch is 7.17 and the compare/head branch is backport-2388-to-7.17.

github-actions bot pushed a commit that referenced this pull request Jan 15, 2024
l-trotta added a commit that referenced this pull request Jan 17, 2024
l-trotta added a commit that referenced this pull request Jan 17, 2024
pquentin pushed a commit that referenced this pull request Jan 18, 2024
(cherry picked from commit d7b42a9)

Co-authored-by: Laura Trotta <[email protected]>
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.

GeoDistanceQuery missing ignore_unmapped definition
2 participants