gitea-mirror/git-crypt
1
0
Fork 0
mirror of https://github.com/AGWA/git-crypt.git synced 2025-12-27 05:03:07 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename add-gpg-key command, etc. to add-gpg-user, etc.

Browse Source 
While writing the documention, I found that "GPG user" was less confusing
terminology than "GPG key," since you aren't really adding a "key"
to git-crypt, and git-crypt already uses "key" to refer to other concepts
(cf. the -k/--key-name options).
This commit is contained in:
Andrew Ayer
2014-09-15 10:02:22 -07:00
parent 04906c5355
commit e4d1091e97
5 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
git-crypt.cpp
View File

@@ -54,9 +54,9 @@ static void print_usage (std::ostream& out)
out << " lock de-configure git-crypt and re-encrypt files in working tree" << std::endl;
out << std::endl;
out << "GPG commands:" << std::endl;
out << " add-gpg-key USRID add the user with the given GPG user ID as a collaborator" << std::endl;
//out << " rm-gpg-key USRID revoke collaborator status from the given GPG user ID" << std::endl;
//out << " ls-gpg-keys list the GPG key IDs of collaborators" << std::endl;
out << " add-gpg-user ID add the user with the given GPG user ID as a collaborator" << std::endl;
//out << " rm-gpg-user ID revoke collaborator status from the given GPG user ID" << std::endl;
//out << " ls-gpg-users list the GPG key IDs of collaborators" << std::endl;
out << " unlock decrypt this repo using the in-repo GPG-encrypted key" << std::endl;
out << std::endl;
out << "Symmetric key commands:" << std::endl;
@@ -86,12 +86,12 @@ static bool help_for_command (const char* command, std::ostream& out)
help_unlock(out);
} else if (std::strcmp(command, "lock") == 0) {
help_lock(out);
} else if (std::strcmp(command, "add-gpg-key") == 0) {
help_add_gpg_key(out);
} else if (std::strcmp(command, "rm-gpg-key") == 0) {
help_rm_gpg_key(out);
} else if (std::strcmp(command, "ls-gpg-keys") == 0) {
help_ls_gpg_keys(out);
} else if (std::strcmp(command, "add-gpg-user") == 0) {
help_add_gpg_user(out);
} else if (std::strcmp(command, "rm-gpg-user") == 0) {
help_rm_gpg_user(out);
} else if (std::strcmp(command, "ls-gpg-users") == 0) {
help_ls_gpg_users(out);
} else if (std::strcmp(command, "export-key") == 0) {
help_export_key(out);
} else if (std::strcmp(command, "keygen") == 0) {
@@ -180,14 +180,14 @@ try {
if (std::strcmp(command, "lock") == 0) {
return lock(argc, argv);
}
if (std::strcmp(command, "add-gpg-key") == 0) {
return add_gpg_key(argc, argv);
if (std::strcmp(command, "add-gpg-user") == 0) {
return add_gpg_user(argc, argv);
}
if (std::strcmp(command, "rm-gpg-key") == 0) {
return rm_gpg_key(argc, argv);
if (std::strcmp(command, "rm-gpg-user") == 0) {
return rm_gpg_user(argc, argv);
}
if (std::strcmp(command, "ls-gpg-keys") == 0) {
return ls_gpg_keys(argc, argv);
if (std::strcmp(command, "ls-gpg-users") == 0) {
return ls_gpg_users(argc, argv);
}
if (std::strcmp(command, "export-key") == 0) {
return export_key(argc, argv);