mv: cleanup empty WORKING_DIRECTORY

Originally, moving from-in-to-out may leave an empty <source>
directory on-disk (this kind of directory is marked as
WORKING_DIRECTORY).

Cleanup such directories if they are empty (don't have any entries
under them).

Modify two tests that take <source> as WORKING_DIRECTORY to test
this behavior.

Suggested-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/mv.c b/builtin/mv.c
index b64c28bd5b22d8379666e339a424a98103f3eabb..f4961c0ffde3c2590236af9b13ac6ee39aab2990 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -171,6 +171,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
        };
        const char **source, **destination, **dest_path, **submodule_gitfile;
        const char *dst_w_slash;
+       const char **src_dir = NULL;
+       int src_dir_nr = 0, src_dir_alloc = 0;
+       struct strbuf a_src_dir = STRBUF_INIT;
        enum update_mode *modes, dst_mode = 0;
        struct stat st;
        struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
@@ -313,6 +316,10 @@ dir_check:
 
                        /* last - first >= 1 */
                        modes[i] |= WORKING_DIRECTORY;
+
+                       ALLOC_GROW(src_dir, src_dir_nr + 1, src_dir_alloc);
+                       src_dir[src_dir_nr++] = src;
+
                        n = argc + last - first;
                        REALLOC_ARRAY(source, n);
                        REALLOC_ARRAY(destination, n);
@@ -505,6 +512,26 @@ remove_entry:
                }
        }
 
+       /*
+        * cleanup the empty src_dirs
+        */
+       for (i = 0; i < src_dir_nr; i++) {
+               int dummy;
+               strbuf_addstr(&a_src_dir, src_dir[i]);
+               /*
+                * if entries under a_src_dir are all moved away,
+                * recursively remove a_src_dir to cleanup
+                */
+               if (index_range_of_same_dir(a_src_dir.buf, a_src_dir.len,
+                                           &dummy, &dummy) < 1) {
+                       remove_dir_recursively(&a_src_dir, 0);
+               }
+               strbuf_reset(&a_src_dir);
+       }
+
+       strbuf_release(&a_src_dir);
+       free(src_dir);
+
        if (gitmodules_modified)
                stage_updated_gitmodules(&the_index);
 

diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh
index d875f492dd1ce605c7711cade22550cbea48f911..df8c0fa5723aaa68d99e906e11dc370c03c8a974 100755 (executable)
--- a/t/t7002-mv-sparse-checkout.sh
+++ b/t/t7002-mv-sparse-checkout.sh
@@ -442,6 +442,7 @@ test_expect_success 'move dirty path from in-cone to out-of-cone' '
 test_expect_success 'move dir from in-cone to out-of-cone' '
        test_when_finished "cleanup_sparse_checkout" &&
        setup_sparse_checkout &&
+       mkdir sub/dir/deep &&
 
        test_must_fail git mv sub/dir folder1 2>stderr &&
        cat sparse_error_header >expect &&
@@ -452,6 +453,7 @@ test_expect_success 'move dir from in-cone to out-of-cone' '
        git mv --sparse sub/dir folder1 2>stderr &&
        test_must_be_empty stderr &&
 
+       test_path_is_missing sub/dir &&
        test_path_is_missing folder1 &&
        git ls-files -t >actual &&
        ! grep "H sub/dir/e" actual &&
@@ -461,6 +463,7 @@ test_expect_success 'move dir from in-cone to out-of-cone' '
 test_expect_success 'move partially-dirty dir from in-cone to out-of-cone' '
        test_when_finished "cleanup_sparse_checkout" &&
        setup_sparse_checkout &&
+       mkdir sub/dir/deep &&
        touch sub/dir/e2 sub/dir/e3 &&
        git add sub/dir/e2 sub/dir/e3 &&
        echo "modified" >>sub/dir/e2 &&
@@ -476,6 +479,7 @@ test_expect_success 'move partially-dirty dir from in-cone to out-of-cone' '
 
        git mv --sparse sub/dir folder1 2>stderr &&
 
+       test_path_is_missing sub/dir &&
        test_path_is_missing folder1/dir/e &&
        test_path_is_file folder1/dir/e2 &&
        test_path_is_file folder1/dir/e3 &&