matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

UpdateHook: return Ok(()) if disabled

Browse source
This commit is contained in:
Matthias Beyer 2016-09-20 09:14:07 +02:00
parent fbd195db25
commit da8736d003
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libimagstorestdhook/src/vcs/git/update.rs
View file

@ -99,11 +99,17 @@ impl StoreIdAccessor for UpdateHook {
use vcs::git::error::MapIntoHookError; use vcs::git::error::MapIntoHookError;
use vcs::git::util::fetch_index; use vcs::git::util::fetch_index;
use vcs::git::config::abort_on_repo_init_err; use vcs::git::config::abort_on_repo_init_err;
use vcs::git::config::is_enabled;
use git2::{ADD_DEFAULT, STATUS_WT_NEW, STATUS_WT_MODIFIED, IndexMatchedPath}; use git2::{ADD_DEFAULT, STATUS_WT_NEW, STATUS_WT_MODIFIED, IndexMatchedPath};
debug!("[GIT UPDATE HOOK]: {:?}", id); debug!("[GIT UPDATE HOOK]: {:?}", id);
let action = StoreAction::Update; let action = StoreAction::Update;
let cfg = try!(self.runtime.config_value_or_err(&action));
if !is_enabled(cfg) {
return Ok(());
}
if !self.runtime.has_repository() { if !self.runtime.has_repository() {
debug!("[GIT UPDATE HOOK]: Runtime has no repository..."); debug!("[GIT UPDATE HOOK]: Runtime has no repository...");
@ -122,7 +128,6 @@ impl StoreIdAccessor for UpdateHook {
} }
let _ = try!(self.runtime.ensure_cfg_branch_is_checked_out(&action)); 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 repo = try!(self.runtime.repository(&action));
let mut index = try!(fetch_index(repo, &action)); let mut index = try!(fetch_index(repo, &action));