Merged. Sorry for the delay.
commit 76382f160d90b3a6c6599d759138a4d3b2409d4f
Author: Jason A. Donenfeld <[email protected]>
Date: Sat Feb 6 20:41:54 2016 +0100
init: put path in commit message
diff --git a/src/password-store.sh b/src/password-store.sh
index 7e9fcb0..032df7f 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -279,19 +279,19 @@ cmd_init() {
rm -v -f "$gpg_id" || exit 1
if [[ -d $GIT_DIR ]]; then
git rm -qr "$gpg_id"
- git_commit "Deinitialize ${gpg_id}."
+ git_commit "Deinitialize ${gpg_id}${id_path:+ ($id_path)}."
fi
rmdir -p "${gpg_id%/*}" 2>/dev/null
else
mkdir -v -p "$PREFIX/$id_path"
printf "%s\n" "$@" > "$gpg_id"
local id_print="$(printf "%s, " "$@")"
- echo "Password store initialized for ${id_print%, }"
- git_add_file "$gpg_id" "Set GPG id to ${id_print%, }."
+ echo "Password store initialized for ${id_print%, }${id_path:+ ($id_path)}"
+ git_add_file "$gpg_id" "Set GPG id to ${id_print%, }${id_path:+ ($id_path)}."
fi
reencrypt_path "$PREFIX/$id_path"
- git_add_file "$PREFIX/$id_path" "Reencrypt password store using new
GPG id ${id_print%, }."
+ git_add_file "$PREFIX/$id_path" "Reencrypt password store using new
GPG id ${id_print%, }${id_path:+ ($id_path)}."
}
cmd_show() {
_______________________________________________
Password-Store mailing list
[email protected]
http://lists.zx2c4.com/mailman/listinfo/password-store
