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

New shapefile layer dialog: avoid accidental overwrite of a file whose extension is not specified #45207

Merged
merged 2 commits into from
Sep 24, 2021

Conversation

rouault
Copy link
Contributor

@rouault rouault commented Sep 22, 2021

and avoid closing the dialog when the user doesn't confirm overwriting

Fixes #44299

@rouault rouault added Bug Either a bug report, or a bug fix. Let's hope for the latter! backport queued_ltr_backports Queued Backports labels Sep 22, 2021
@github-actions github-actions bot added this to the 3.22.0 milestone Sep 22, 2021
…e extension is not specified

and avoid closing the dialog when the user doesn't confirm overwriting

Fixes qgis#44299
src/gui/qgsnewvectorlayerdialog.cpp Outdated Show resolved Hide resolved
src/gui/qgsnewvectorlayerdialog.cpp Outdated Show resolved Hide resolved
@nyalldawson nyalldawson enabled auto-merge (rebase) September 23, 2021 22:36
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports 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-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-45207-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6006a0d218972b9be153c511413dfe82285b7c86,a27a7a777afd6a26461434e4097b2d01e3bd3219
# Push it to GitHub
git push --set-upstream origin backport-45207-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

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

@rouault
Copy link
Contributor Author

rouault commented Sep 24, 2021

Manually backported in #45240

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports Bug Either a bug report, or a bug fix. Let's hope for the latter!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

New Shapefile layer silently overwrite existing files
3 participants