[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  bcd25b7f7f500e8db24e5a10e6add1e61660c842 (commit)
      from  05eeb7d58f132f8ba2b956817695cfcc53001e89 (commit)

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


- Log -----------------------------------------------------------------
commit bcd25b7f7f500e8db24e5a10e6add1e61660c842
Author: David M. Lee <dlee at digium.com>
Date:   Mon Jan 24 10:43:41 2011 -0600

    Corrected message when pulling existing repos.
    
    The message implied that it would always pull from origin, when in fact
    it pulls from whatever happens to be the upstream branch.

diff --git a/gitall-asterisk-scf.sh b/gitall-asterisk-scf.sh
index 32a07c7..5f72d66 100755
--- a/gitall-asterisk-scf.sh
+++ b/gitall-asterisk-scf.sh
@@ -169,7 +169,11 @@ EOF
                         git config --unset remote.origin.pushurl
                     fi )
                 if ( cd ${repoDir} && git rev-parse --verify @{upstream} > /dev/null 2>&1 ); then
-                    echo ">> Pulling from repo ${repoUri}"
+                    upstream=$(
+                        cd ${repoDir} &&
+                        git for-each-ref --format="%(upstream:short)"
+                            $(git rev-parse --symbolic-full-name HEAD))
+                    echo ">> Pulling from ${upstream} (${repoDir})"
                     ( cd ${repoDir} && git pull )
                 else
                     echo "-- Skipping ${repoDir}; no upstream branch"

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


-- 
asterisk-scf/integration/gitall.git