From 680ee550d72150f27cdb3235462eee355a20038b Mon Sep 17 00:00:00 2001 From: Kevin Willford Date: Mon, 14 Aug 2017 15:54:25 -0600 Subject: [PATCH] commit: skip discarding the index if there is no pre-commit hook If there is not a pre-commit hook, there is no reason to discard the index and reread it. This change checks to presence of a pre-commit hook and then only discards the index if there was one. Signed-off-by: Kevin Willford Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/commit.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 2de5f6cc64..6448ef48b0 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -943,13 +943,16 @@ static int prepare_to_commit(const char *index_file, const char *prefix, return 0; } - /* - * Re-read the index as pre-commit hook could have updated it, - * and write it out as a tree. We must do this before we invoke - * the editor and after we invoke run_status above. - */ - discard_cache(); + if (!no_verify && find_hook("pre-commit")) { + /* + * Re-read the index as pre-commit hook could have updated it, + * and write it out as a tree. We must do this before we invoke + * the editor and after we invoke run_status above. + */ + discard_cache(); + } read_cache_from(index_file); + if (update_main_cache_tree(0)) { error(_("Error building trees")); return 0;