gitea-mirror/git-crypt
1
0
Fork 0
mirror of https://github.com/AGWA/git-crypt.git synced 2025-12-18 02:09:13 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename add-collab, etc. to add-gpg-key, etc.

Browse Source 
Since GPG support might be used by a single user and not necessarily
among collaborators.
This commit is contained in:
Andrew Ayer
2014-07-05 11:46:51 -07:00
parent 2ba7f0e374
commit 3fe85bc928
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
commands.cpp
View File

@@ -780,7 +780,7 @@ int unlock (int argc, char** argv)
return 0;
}
int add_collab (int argc, char** argv)
int add_gpg_key (int argc, char** argv)
{
const char* key_name = 0;
Options_list options;
@@ -863,13 +863,13 @@ int add_collab (int argc, char** argv)
return 0;
}
int rm_collab (int argc, char** argv) // TODO
int rm_gpg_key (int argc, char** argv) // TODO
{
std::clog << "Error: rm-collab is not yet implemented." << std::endl;
std::clog << "Error: rm-gpg-key is not yet implemented." << std::endl;
return 1;
}
int ls_collabs (int argc, char** argv) // TODO
int ls_gpg_keys (int argc, char** argv) // TODO
{
// Sketch:
// Scan the sub-directories in .git-crypt/keys, outputting something like this:
@@ -885,7 +885,7 @@ int ls_collabs (int argc, char** argv) // TODO
// To resolve a long hex ID, use a command like this:
// gpg --options /dev/null --fixed-list-mode --batch --with-colons --list-keys 0x143DE9B3F7316900
std::clog << "Error: ls-collabs is not yet implemented." << std::endl;
std::clog << "Error: ls-gpg-keys is not yet implemented." << std::endl;
return 1;
}

6
commands.hpp
View File

@@ -46,9 +46,9 @@ int diff (int argc, char** argv);
// Public commands:
int init (int argc, char** argv);
int unlock (int argc, char** argv);
int add_collab (int argc, char** argv);
int rm_collab (int argc, char** argv);
int ls_collabs (int argc, char** argv);
int add_gpg_key (int argc, char** argv);
int rm_gpg_key (int argc, char** argv);
int ls_gpg_keys (int argc, char** argv);
int export_key (int argc, char** argv);
int keygen (int argc, char** argv);
int migrate_key (int argc, char** argv);

12
git-crypt.cpp
View File

@@ -139,14 +139,14 @@ try {
if (std::strcmp(command, "unlock") == 0) {
return unlock(argc, argv);
}
if (std::strcmp(command, "add-collab") == 0) {
return add_collab(argc, argv);
if (std::strcmp(command, "add-gpg-key") == 0) {
return add_gpg_key(argc, argv);
}
if (std::strcmp(command, "rm-collab") == 0) {
return rm_collab(argc, argv);
if (std::strcmp(command, "rm-gpg-key") == 0) {
return rm_gpg_key(argc, argv);
}
if (std::strcmp(command, "ls-collabs") == 0) {
return ls_collabs(argc, argv);
if (std::strcmp(command, "ls-gpg-keys") == 0) {
return ls_gpg_keys(argc, argv);
}
if (std::strcmp(command, "export-key") == 0) {
return export_key(argc, argv);