Do not replace filled gitignore files with empty ones

Author: Vampire

src/svn.cpp

@@ -1102,6 +1102,19 @@ int SvnRevision::addGitIgnore(apr_pool_t *pool, const char *key, QString path,
         if (apr_hash_count(entries)!=0) {
             return EXIT_FAILURE;
         }
+
+        // if svn-ignore should have added a .gitignore file, do not overwrite it with an empty one
+        // if svn:ignore could not be determined, stay safe and do not overwrite the .gitignore file
+        // even if then an empty directory might be missing
+        QString svnignore;
+        if (CommandLineParser::instance()->contains("svn-ignore")) {
+            if (fetchIgnoreProps(&svnignore, pool, key, fs_root) != EXIT_SUCCESS) {
+                qWarning() << "Error fetching svn-properties (" << key << ")";
+                return EXIT_FAILURE;
+            } else if (!svnignore.isNull()) {
+                return EXIT_FAILURE;
+            }
+        }
     }
 
     // Add gitignore-File

test/empty-dirs.bats

@@ -979,3 +979,69 @@ load 'common'
     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-ignore, svn-branches and empty-dirs parameter should not replace filled .gitignore files with empty ones' {
+    svn mkdir --parents trunk/dir-a
+    svn propset svn:ignore 'ignore-a' 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 --svn-ignore --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_equal "$(git -C git-repo show master:dir-a/.gitignore)" '/ignore-a'
+    assert_equal "$(git -C git-repo show branch-a:dir-a/.gitignore)" '/ignore-a'
+}
+
+@test 'branching with svn-ignore, svn-branches and empty-dirs parameter should not replace filled .gitignore files with empty ones' {
+    svn mkdir project-a
+    cd project-a
+    svn mkdir --parents trunk/dir-a
+    svn propset svn:ignore 'ignore-a' 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 --svn-ignore --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_equal "$(git -C git-repo show master:dir-a/.gitignore)" '/ignore-a'
+    assert_equal "$(git -C git-repo show branch-a:dir-a/.gitignore)" '/ignore-a'
+}