commit: don't rewrite shared index unnecessarily

Remove a cache invalidation which would cause the shared index to be
rewritten on as-is commits.

When the cache-tree has changed, we need to update it.  But we don't
necessarily need to update the shared index.  So setting
active_cache_changed to SOMETHING_CHANGED is unnecessary.  Instead, we
let update_main_cache_tree just update the CACHE_TREE_CHANGED bit.

In order to test this, make test-dump-split-index not segfault on
missing replace_bitmap/delete_bitmap.  This new codepath is not called
now that the test passes, but is necessary to avoid a segfault when the
new test is run with the old builtin/commit.c code.

Signed-off-by: David Turner <dturner@twopensource.com>
Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit.c b/builtin/commit.c
index 254477fd1d4e8b96f50eb42dc11ec1253c7467f8..1692620e25fe4fd7fe658c7f00a2bdea0ae90138 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -404,10 +404,8 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
                hold_locked_index(&index_lock, 1);
                refresh_cache_or_die(refresh_flags);
                if (active_cache_changed
                hold_locked_index(&index_lock, 1);
                refresh_cache_or_die(refresh_flags);
                if (active_cache_changed

-                   || !cache_tree_fully_valid(active_cache_tree)) {
+                   || !cache_tree_fully_valid(active_cache_tree))

                        update_main_cache_tree(WRITE_TREE_SILENT);
                        update_main_cache_tree(WRITE_TREE_SILENT);

-                       active_cache_changed = 1;
-               }

                if (active_cache_changed) {
                        if (write_locked_index(&the_index, &index_lock,
                                               COMMIT_LOCK))
                if (active_cache_changed) {
                        if (write_locked_index(&the_index, &index_lock,
                                               COMMIT_LOCK))

diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 601d02d71f735b4247528cc45b0ea055299ee7a0..f92dd1f1dccad0f87bf6dd32761caf2c8919fc5c 100755 (executable)
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -218,4 +218,14 @@ test_expect_success 'no phantom error when switching trees' '
        ! test -s errors
 '
 
        ! test -s errors
 '
 

+test_expect_success 'switching trees does not invalidate shared index' '
+       git update-index --split-index &&
+       >split &&
+       git add split &&
+       test-dump-split-index .git/index | grep -v ^own >before &&
+       git commit -m "as-is" &&
+       test-dump-split-index .git/index | grep -v ^own >after &&
+       test_cmp before after
+'
+

 test_done
 test_done

diff --git a/test-dump-split-index.c b/test-dump-split-index.c
index 9cf3112c9d384c98e68b0fc2c10b5d83b5136c18..861d28c9b6c1b4d95f74ffbd95bc279ea0d377eb 100644 (file)
--- a/test-dump-split-index.c
+++ b/test-dump-split-index.c
@@ -26,9 +26,11 @@ int main(int ac, char **av)
                       sha1_to_hex(ce->sha1), ce_stage(ce), ce->name);
        }
        printf("replacements:");
                       sha1_to_hex(ce->sha1), ce_stage(ce), ce->name);
        }
        printf("replacements:");

-       ewah_each_bit(si->replace_bitmap, show_bit, NULL);
+       if (si->replace_bitmap)
+               ewah_each_bit(si->replace_bitmap, show_bit, NULL);

        printf("\ndeletions:");
        printf("\ndeletions:");

-       ewah_each_bit(si->delete_bitmap, show_bit, NULL);
+       if (si->delete_bitmap)
+               ewah_each_bit(si->delete_bitmap, show_bit, NULL);

        printf("\n");
        return 0;
 }
        printf("\n");
        return 0;
 }