You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/03/20 15:00:27 UTC

[sling-tooling-scm] 18/35: SLING-3987 - move from Subversion to Git

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-tooling-scm.git

commit 5d9bc55e0102129378cb629ca04347f39bbf8e90
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Sep 29 08:31:21 2017 +0000

    SLING-3987 - move from Subversion to Git
    
    Make push mode work incrementally as well
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810069 13f79535-47bb-0310-9956-ffa450edef68
---
 scripts/migrate-to-git.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/migrate-to-git.sh b/scripts/migrate-to-git.sh
index 3c3817b..129456d 100755
--- a/scripts/migrate-to-git.sh
+++ b/scripts/migrate-to-git.sh
@@ -156,8 +156,12 @@ while read -r module; do
     else # -p
         pushd ${git_repo_location}/${repo_name}
         # TODO - use the ASF remotes for the final run
-        git remote add origin https://github.com/not-sling/${repo_name}.git
-        git push -u origin master
+        if [ $(git remote show | grep origin | wc -l) -eq 0 ]; then
+            git remote add origin https://github.com/not-sling/${repo_name}.git
+            git push -u origin master
+        else
+            echo "Remote origin already exists, skipping"
+        fi
         popd
     fi
 done