[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  6f5379cf9b46e4e977fb2c62404ca1ddcc3a3d77 (commit)
      from  e0a03af528e4d223862b2a65945fdd867517bb95 (commit)

Summary of changes:
 gitall-asterisk-scf.sh |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 6f5379cf9b46e4e977fb2c62404ca1ddcc3a3d77
Author: David M. Lee <dlee at digium.com>
Date:   Thu Oct 7 15:04:57 2010 -0500

    Improved script when a component is on a branch.

diff --git a/gitall-asterisk-scf.sh b/gitall-asterisk-scf.sh
index 5856a19..44364e6 100755
--- a/gitall-asterisk-scf.sh
+++ b/gitall-asterisk-scf.sh
@@ -66,10 +66,14 @@ for repo in "${repos[@]}"; do
    repoUri=${gitdepot}:${tree}/${repo}
 
    if [ -d ${repoDir}/.git ]; then
-      echo ">> Updating from repo ${repoUri}"
-      ( cd ${repoDir} && git pull && git submodule update --init --recursive)
+      if ( cd ${repoDir} && git rev-parse --verify @{upstream} > /dev/null 2>&1 ); then
+         echo ">> Updating from repo ${repoUri}"
+         ( cd ${repoDir} && git pull && git submodule update --init --recursive)
+      else
+         echo "-- Skipping ${repoDir}; no upstream branch"
+      fi
    else
-      echo ">> Cloning from $repoUri to ${repo[i]}"
+      echo ">> Cloning from ${repoUri} to ${repoDir}"
       git clone --recursive ${repoUri} ${repoDir}
    fi
    echo " "

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/gitall.git