Add gitignore placeholders for empty directories in branches when using svn-branches and empty-dirs parameter

Author: Vampire

src/svn.cpp

@@ -823,6 +823,9 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change2_t *ch
                 txn->deleteFile(path);
                 checkParentNotEmpty(pool, key, path, fs_root, txn);
                 recursiveDumpDir(txn, fs, fs_root, key, path, pool, revnum, rule, matchRules, ruledebug, false);
+                if (CommandLineParser::instance()->contains("empty-dirs")) {
+                    addGitIgnoreOnBranch(pool, key, path, fs_root, txn);
+                }
             }
             if (rule.annotate) {
                 // create an annotated tag

test/empty-dirs.bats

@@ -911,3 +911,71 @@ load 'common'
     assert git -C git-repo show master:dir-b/.gitignore
     assert_equal "$(git -C git-repo show master:dir-b/.gitignore)" ''
 }
+
+@test 'branching with svn-branches and empty-dirs parameter should put empty .gitignore files to empty directories' {
+    svn mkdir --parents trunk/dir-a
+    svn commit -m 'add trunk/dir-a'
+    svn mkdir branches
+    svn cp trunk branches/branch-a
+    svn commit -m 'create branch-a'
+
+    cd "$TEST_TEMP_DIR"
+    svn2git "$SVN_REPO" --empty-dirs --svn-branches --rules <(echo "
+        create repository git-repo
+        end repository
+
+        match /trunk/
+            repository git-repo
+            branch master
+        end match
+
+        match /branches/$
+            action recurse
+        end match
+
+        match /branches/([^/]+)/
+            repository git-repo
+            branch \1
+        end match
+    ")
+
+    assert git -C git-repo show master:dir-a/.gitignore
+    assert_equal "$(git -C git-repo show master:dir-a/.gitignore)" ''
+    assert git -C git-repo show branch-a:dir-a/.gitignore
+    assert_equal "$(git -C git-repo show branch-a:dir-a/.gitignore)" ''
+}
+
+@test 'branching with svn-branches and empty-dirs parameter should put empty .gitignore files to empty directories (nested)' {
+    svn mkdir project-a
+    cd project-a
+    svn mkdir --parents trunk/dir-a
+    svn commit -m 'add trunk/dir-a'
+    svn mkdir branches
+    svn cp trunk branches/branch-a
+    svn commit -m 'create branch-a'
+
+    cd "$TEST_TEMP_DIR"
+    svn2git "$SVN_REPO" --empty-dirs --svn-branches --rules <(echo "
+        create repository git-repo
+        end repository
+
+        match /project-a/trunk/
+            repository git-repo
+            branch master
+        end match
+
+        match /project-a/branches/([^/]+)/
+            repository git-repo
+            branch \1
+        end match
+
+        match /project-a/(branches/)?$
+            action recurse
+        end match
+    ")
+
+    assert git -C git-repo show master:dir-a/.gitignore
+    assert_equal "$(git -C git-repo show master:dir-a/.gitignore)" ''
+    assert git -C git-repo show branch-a:dir-a/.gitignore
+    assert_equal "$(git -C git-repo show branch-a:dir-a/.gitignore)" ''
+}