Merge branch 'mv/merge-refresh'

* mv/merge-refresh:
builtin-merge: refresh the index before calling a strategy

diff --git a/builtin-merge.c b/builtin-merge.c
index fa7c95472c984b0a8325aa61a75137c0a8c1e36e..38266baf5fe9f54a0006baaae205b55f12ed15fc 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -546,6 +546,16 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
        int i = 0, ret;
        struct commit_list *j;
        struct strbuf buf;
+       int index_fd;
+       struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
+
+       index_fd = hold_locked_index(lock, 1);
+       refresh_cache(REFRESH_QUIET);
+       if (active_cache_changed &&
+                       (write_cache(index_fd, active_cache, active_nr) ||
+                        commit_locked_index(lock)))
+               return error("Unable to write index.");
+       rollback_lock_file(lock);
 
        if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
                int clean;

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 9516f541e9c47f83fed2fc8d3baa065a9bb206de..7313ac278cb7cb1d741e49f261e65d929ddeffb7 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -511,4 +511,13 @@ test_expect_success 'in-index merge' '
 
 test_debug 'gitk --all'
 
+test_expect_success 'refresh the index before merging' '
+       git reset --hard c1 &&
+       sleep 1 &&
+       touch file &&
+       git merge c3
+'
+
+test_debug 'gitk --all'
+
 test_done