Rename config directory to build-aux to follow autotools conventions

[hvutilities.git] / scripts / git-hg-sub-import

diff --git a/scripts/git-hg-sub-import b/scripts/git-hg-sub-import
index 64b1035..41617d1 100755 (executable)
--- a/scripts/git-hg-sub-import
+++ b/scripts/git-hg-sub-import
@@ -24,8 +24,10 @@ hg_subpaths_config() {
         sp_src=${sp_src//\\/} # Remove windows separator (LSI)
         sp_dst=${subpaths//*=/}
 
-        echo "sp_src = $sp_src"
-        echo "sp_dst = $sp_dst"
+        if [ -n "${debug}" ]; then
+            echo "sp_src = $sp_src"
+            echo "sp_dst = $sp_dst"
+        fi
     fi
 }
 
@@ -41,7 +43,7 @@ subrepo_find_branch() {
     local id="${2}"
     local rev="${3}"
 
-    pushd "${src}"
+    pushd "${src}" 1> /dev/null
 
     branch=$(hg log -r ${rev} | grep "branch:" | sed "s/branch:\ *//")
 
@@ -58,7 +60,7 @@ subrepo_find_branch() {
         echo "  num:    ${num}"
     fi
 
-    popd
+    popd 1> /dev/null
 }
 
 if [ "x${1}" = "x--help" ]; then
@@ -137,10 +139,6 @@ while read sub; do
                 # Ignore subrepo in top-level git repository
                 echo "${dest}" >> .gitignore
             fi
-        else
-            pushd "${dest}"
-            git pull
-            popd
         fi
     fi
 done < .hgsub