From be323a641e361820ad1d51186113dd5c520a74da Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 20 Sep 2016 15:34:08 +0200 Subject: [PATCH] Check whether committing is enabled before doing so --- libimagstorestdhook/src/vcs/git/delete.rs | 6 ++++++ libimagstorestdhook/src/vcs/git/update.rs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/libimagstorestdhook/src/vcs/git/delete.rs b/libimagstorestdhook/src/vcs/git/delete.rs index a2756a55..9886d252 100644 --- a/libimagstorestdhook/src/vcs/git/delete.rs +++ b/libimagstorestdhook/src/vcs/git/delete.rs @@ -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!( diff --git a/libimagstorestdhook/src/vcs/git/update.rs b/libimagstorestdhook/src/vcs/git/update.rs index d84ffcff..f017c87b 100644 --- a/libimagstorestdhook/src/vcs/git/update.rs +++ b/libimagstorestdhook/src/vcs/git/update.rs @@ -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!(