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

Only run git_deconfig if Git configuration exists

Browse Source 
This will let us run 'git lock' even if no filters are configured.

This logic is more complicated than I would like because running
'git config --remove-section' on a non-existent section results in
a noisy error (with text printed to stderr and an exit code of 128)
instead of a quiet error like the other 'git config' commands.
This commit is contained in:
Andrew Ayer
2015-02-07 12:53:54 -08:00
parent fc583c7d4f
commit 0c8dae2375
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
commands.cpp
View File

@@ -73,6 +73,22 @@ static void git_config (const std::string& name, const std::string& value)
}
}
static bool git_has_config (const std::string& name)
{
std::vector<std::string> command;
command.push_back("git");
command.push_back("config");
command.push_back("--get-all");
command.push_back(name);
std::stringstream output;
switch (exit_status(exec_command(command, output))) {
case 0: return true;
case 1: return false;
default: throw Error("'git config' failed");
}
}
static void git_deconfig (const std::string& name)
{
std::vector<std::string> command;
@@ -110,8 +126,16 @@ static void configure_git_filters (const char* key_name)
static void deconfigure_git_filters (const char* key_name)
{
// deconfigure the git-crypt filters
git_deconfig("filter." + attribute_name(key_name));
git_deconfig("diff." + attribute_name(key_name));
if (git_has_config("filter." + attribute_name(key_name) + ".smudge") ||
git_has_config("filter." + attribute_name(key_name) + ".clean") ||
git_has_config("filter." + attribute_name(key_name) + ".required")) {
git_deconfig("filter." + attribute_name(key_name));
}
if (git_has_config("diff." + attribute_name(key_name) + ".textconv")) {
git_deconfig("diff." + attribute_name(key_name));
}
}
static bool git_checkout (const std::vector<std::string>& paths)