Merge branch 'rs/dedup-includes'

[thirdparty/git.git] / builtin / am.c

diff --git a/builtin/am.c b/builtin/am.c
index b015e1d7d14c1c7f561ef8ffbe75c37225ab86f0..761cac39e02a7f45dd7f95f05d31e0ad373be214 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1070,19 +1070,6 @@ static const char *msgnum(const struct am_state *state)
        return sb.buf;
 }
 
-/**
- * Refresh and write index.
- */
-static void refresh_and_write_cache(void)
-{
-       struct lock_file lock_file = LOCK_INIT;
-
-       hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
-       refresh_cache(REFRESH_QUIET);
-       if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
-               die(_("unable to write index file"));
-}
-
 /**
  * Dies with a user-friendly message on how to proceed after resolving the
  * problem. This message can be overridden with state->resolvemsg.
@@ -1704,7 +1691,8 @@ static void am_run(struct am_state *state, int resume)
 
        unlink(am_path(state, "dirtyindex"));
 
-       refresh_and_write_cache();
+       if (refresh_and_write_cache(REFRESH_QUIET, 0, 0) < 0)
+               die(_("unable to write index file"));
 
        if (repo_index_has_changes(the_repository, NULL, &sb)) {
                write_state_bool(state, "dirtyindex", 1);