Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-21 05:14:40 -04:00
Code Issues Projects Releases Packages Wiki Activity

CLI: Fix keyfile from/to parameter collision in merge command

Browse source 
Rename 'k' to 'f' because 'k' is already used to specify the key for the target database of the merge

* Remove short -f option from keepassxc-cli.1
* Remove -f option from keepassxc-cli merge
* Add test cases covering cli options for merge
* Add functional test for merge with keys
This commit is contained in:
Wizz 2019-12-21 09:46:01 -05:00 • committed by Jonathan White
parent c0796d8fb1
commit 0654ffc117
5 changed files with 107 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
share/docs/man/keepassxc-cli.1
View file

@ -117,7 +117,7 @@ Displays the program version.
.IP "-d, --dry-run <path>"
Prints the changes detected by the merge operation without making any changes to the database.
.IP "-f, --key-file-from <path>"
.IP "--key-file-from <path>"
Sets the path of the key file for the second database.
.IP "--no-password-from"