From 84815317659d40319703bac18cd4388990ed4cee Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Fri, 18 Apr 2014 01:57:13 +0200
Subject: reencrypt: remove option, do automatically

---
 src/completion/pass.bash-completion | 4 ++--
 src/completion/pass.fish-completion | 4 ----
 src/completion/pass.zsh-completion  | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/completion')

diff --git a/src/completion/pass.bash-completion b/src/completion/pass.bash-completion
index d04125b..d8d65c7 100644
--- a/src/completion/pass.bash-completion
+++ b/src/completion/pass.bash-completion
@@ -65,7 +65,7 @@ _pass()
 				if [[ $lastarg == "-p" || $lastarg == "--path" ]]; then
 					_pass_complete_folders
 				else
-					COMPREPLY+=($(compgen -W "-e --reencrypt -p --path" -- ${cur}))
+					COMPREPLY+=($(compgen -W "-p --path" -- ${cur}))
 					_pass_complete_keys
 				fi
 				;;
@@ -85,7 +85,7 @@ _pass()
 				_pass_complete_entries
 				;;
 			cp|copy|mv|rename)
-				COMPREPLY+=($(compgen -W "-e --reencrypt -f --force" -- ${cur}))
+				COMPREPLY+=($(compgen -W "-f --force" -- ${cur}))
 				_pass_complete_entries
 				;;
 			rm|remove|delete)
diff --git a/src/completion/pass.fish-completion b/src/completion/pass.fish-completion
index aa09288..e973882 100644
--- a/src/completion/pass.fish-completion
+++ b/src/completion/pass.fish-completion
@@ -62,9 +62,7 @@ complete -c $PROG -f -A -n '__fish_pass_needs_command' -a help -d 'Command: show
 complete -c $PROG -f -A -n '__fish_pass_needs_command' -a version -d 'Command: show program version'
 
 complete -c $PROG -f -A -n '__fish_pass_needs_command' -a init -d 'Command: initialize new password storage'
-complete -c $PROG -f -A -n '__fish_pass_uses_command init' -s e -l reencrypt -d 'Reencrypt existing passwords using new gpg-id'
 complete -c $PROG -f -A -n '__fish_pass_uses_command init' -s p -l path -d 'Assign gpg-id for specified sub folder of password store'
-complete -c $PROG -f -A -n '__fish_contains_opt -s e reencrypt' -a '(__fish_pass_print_gpg_keys)'
 
 complete -c $PROG -f -A -n '__fish_pass_needs_command' -a ls -d 'Command: list passwords'
 complete -c $PROG -f -A -n '__fish_pass_uses_command ls' -a "(__fish_pass_print_entry_dirs)"
@@ -83,12 +81,10 @@ complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -a "(__fish_pass_
 
 complete -c $PROG -f -A -n '__fish_pass_needs_command' -a mv -d 'Command: rename existing password'
 complete -c $PROG -f -A -n '__fish_pass_uses_command mv' -s f -l force -d 'Force rename'
-complete -c $PROG -f -A -n '__fish_pass_uses_command mv' -s e -l reencrypt -d 'Reencrypt files if new location has different gpg-id'
 complete -c $PROG -f -A -n '__fish_pass_uses_command mv' -a "(__fish_pass_print_entries_and_dirs)"
 
 complete -c $PROG -f -A -n '__fish_pass_needs_command' -a cp -d 'Command: copy existing password'
 complete -c $PROG -f -A -n '__fish_pass_uses_command cp' -s f -l force -d 'Force copy'
-complete -c $PROG -f -A -n '__fish_pass_uses_command cp' -s e -l reencrypt -d 'Reencrypt files if new location has different gpg-id'
 complete -c $PROG -f -A -n '__fish_pass_uses_command cp' -a "(__fish_pass_print_entries_and_dirs)"
 
 complete -c $PROG -f -A -n '__fish_pass_needs_command' -a rm -d 'Command: remove existing password'
diff --git a/src/completion/pass.zsh-completion b/src/completion/pass.zsh-completion
index cb78115..892d3de 100644
--- a/src/completion/pass.zsh-completion
+++ b/src/completion/pass.zsh-completion
@@ -23,8 +23,6 @@ _pass () {
 		case "${cmd}" in
 			init)
 				_arguments : \
-					"-e[re-encrypt existing passwords]" \
-					"--reencrypt[re-encrypt existing passwords]" \
 					"-p[gpg-id will only be applied to this subfolder]" \
 					"--path[gpg-id will only be applied to this subfolder]"
 				_pass_complete_keys
@@ -51,9 +49,7 @@ _pass () {
 			cp|copy|mv|rename)
 				_arguments : \
 					"-f[force rename]" \
-					"--force[force rename]" \
-					"-e[reencrypt to new gpg-id]" \
-					"--reencrypt[reencrypt to new gpg-id]"
+					"--force[force rename]"
 					_pass_complete_entries_with_subdirs
 				;;
 			rm)
-- 
cgit v1.2.3