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

For consistency, always use NULL internally to represent the default key

Browse Source
This commit is contained in:
Andrew Ayer
2014-09-12 19:45:21 -07:00
parent 88e8e3a265
commit e9e90fc873
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
commands.cpp
View File

@@ -99,7 +99,7 @@ static void configure_git_filters (const char* key_name)
static void unconfigure_git_filters (const char* key_name)
{
// unconfigure the git-crypt filters
if (key_name && (strncmp(key_name, "default", 7) != 0)) {
if (key_name) {
// named key
git_unconfig(std::string("filter.git-crypt-") + key_name);
git_unconfig(std::string("diff.git-crypt-") + key_name);
@@ -908,8 +908,9 @@ int lock (int argc, const char** argv)
std::vector<std::string> dirents = get_directory_contents(get_internal_keys_path().c_str());
for (std::vector<std::string>::const_iterator dirent(dirents.begin()); dirent != dirents.end(); ++dirent) {
unlink_internal_key(dirent->c_str());
unconfigure_git_filters(dirent->c_str());
const char* this_key_name = (*dirent == "default" ? 0 : dirent->c_str());
unlink_internal_key(this_key_name);
unconfigure_git_filters(this_key_name);
}
} else {
// just handle the given key