trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: February 2012

git /scripts will need updating to handle git >= 1.6.5 - experimental still doesn't update

From: "David C. Rankin" <drankinatty@...>
Date: Fri, 17 Feb 2012 15:34:58 -0600
Tim, all,

  It appears that the git tde/scripts will need updating to work with git >=
1.6.5. I still get the error:


  git submodule foreach
"/dat_f/tde/git/scripts/switch_all_submodules_to_head_and_clean drankin"

Entering 'experimental'
This script can only be run from a top level git directory.  Exiting...
Stopping at 'experimental'; script returned non-zero status.

  What that means is the foreach loop in switch_all_submodules_to_head_and_clean
gets to experimental, crashes and then doesn't complete for any of the remaining
modules in:

'git submodule scripts/switch_all_submodules_to_head_and_clean'

  It seems to be failing on:

        git submodule foreach "$THISSCRIPT $gituser"

maybe it should be?:

        git submodule foreach --recursive "$THISSCRIPT $gituser"


Below are a couple of patches for the scripts inserting '--recursive' where
applicable:

--- scripts/switch_all_submodules_to_head_and_clean
+++ scripts/switch_all_submodules_to_head_and_clean     2012-02-17
11:42:56.955472310 -0600
@@ -37,10 +37,10 @@
        fi

        git submodule init
-       git submodule update
-       git submodule foreach "git checkout master"
-       git submodule foreach "git pull"
-       git submodule foreach "$THISSCRIPT $gituser"
+       git submodule update --recursive
+       git submodule foreach --recursive "git checkout master"
+       git submodule foreach --recursive "git pull"
+       git submodule foreach --recursive "$THISSCRIPT $gituser"

        git checkout -- .gitmodules
 fi


--- scripts/update_all_submodules
+++ scripts/update_all_submodules       2012-02-17 11:50:19.504957047 -0600
@@ -30,7 +30,7 @@
                        cd ../
                done
                git submodule init
-               git submodule update
+               git submodule update --recursive
                cd $PARENTDIR/$DIR2UPDATE
                git reset --hard HEAD
                git clean -d -x -f


  At least I am not cloning the admin and cmake contents!

-- 
David C. Rankin, J.D.,P.E.