summaryrefslogtreecommitdiffstats
path: root/libimagstorestdhook
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2016-09-20 09:13:56 +0200
committerMatthias Beyer <mail@beyermatthias.de>2016-09-20 09:35:03 +0200
commitfbd195db25bd496633b9c7d355f0c2c0f70b6935 (patch)
treee95d84aba4802580e116c22e3b2a9e30c6905fb5 /libimagstorestdhook
parentd115e4ca8e0aac7a6a8726e495be1ccfc3da4c72 (diff)
DeleteHook: return Ok(()) if disabled
Diffstat (limited to 'libimagstorestdhook')
-rw-r--r--libimagstorestdhook/src/vcs/git/delete.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/libimagstorestdhook/src/vcs/git/delete.rs b/libimagstorestdhook/src/vcs/git/delete.rs
index b44bf878..b5c0e56b 100644
--- a/libimagstorestdhook/src/vcs/git/delete.rs
+++ b/libimagstorestdhook/src/vcs/git/delete.rs
@@ -85,11 +85,17 @@ impl StoreIdAccessor for DeleteHook {
use vcs::git::error::MapIntoHookError;
use vcs::git::util::fetch_index;
use vcs::git::config::abort_on_repo_init_err;
+ use vcs::git::config::is_enabled;
use git2::{ADD_DEFAULT, STATUS_WT_DELETED, IndexMatchedPath};
debug!("[GIT DELETE HOOK]: {:?}", id);
let action = StoreAction::Delete;
+ let cfg = try!(self.runtime.config_value_or_err(&action));
+
+ if !is_enabled(cfg) {
+ return Ok(())
+ }
if !self.runtime.has_repository() {
debug!("[GIT DELETE HOOK]: Runtime has no repository...");
@@ -108,7 +114,6 @@ impl StoreIdAccessor for DeleteHook {
}
let _ = try!(self.runtime.ensure_cfg_branch_is_checked_out(&action));
- let cfg = try!(self.runtime.config_value_or_err(&action));
let repo = try!(self.runtime.repository(&action));
let mut index = try!(fetch_index(repo, &action));