diff options
| -rw-r--r-- | builtin/commit.c | 15 |
1 files 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; |