matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Check whether committing is enabled before doing so

This commit is contained in:
Matthias Beyer 2016-09-20 15:34:08 +02:00
parent 5b7ff231a9
commit be323a641e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libimagstorestdhook/src/vcs/git/delete.rs
View File

@ -105,6 +105,7 @@ impl StoreIdAccessor for DeleteHook {
use vcs::git::util::fetch_index;
use vcs::git::config::abort_on_repo_init_err;
use vcs::git::config::is_enabled;
use vcs::git::config::committing_is_enabled;
use git2::{ADD_DEFAULT, STATUS_WT_DELETED, IndexMatchedPath};
debug!("[GIT DELETE HOOK]: {:?}", id);
@ -189,6 +190,11 @@ impl StoreIdAccessor for DeleteHook {
.map_into_hook_error()
);
if !try!(committing_is_enabled(cfg)) {
debug!("Committing not enabled. This is fine, returning now...");
return Ok(())
}
let mut parents = Vec::new();
{
let commit = try!(

6
libimagstorestdhook/src/vcs/git/update.rs
View File

@ -119,6 +119,7 @@ impl StoreIdAccessor for UpdateHook {
use vcs::git::util::fetch_index;
use vcs::git::config::abort_on_repo_init_err;
use vcs::git::config::is_enabled;
use vcs::git::config::committing_is_enabled;
use git2::{ADD_DEFAULT, STATUS_WT_NEW, STATUS_WT_MODIFIED, IndexMatchedPath};
debug!("[GIT UPDATE HOOK]: {:?}", id);
@ -212,6 +213,11 @@ impl StoreIdAccessor for UpdateHook {
.map_into_hook_error()
);
if !try!(committing_is_enabled(cfg)) {
debug!("Committing not enabled. This is fine, returning now...");
return Ok(())
}
let mut parents = Vec::new();
{
let commit = try!(