[Libreoffice-commits] .: Branch 'feature/submodules' - 2 commits - g

[Libreoffice Gerrit user]

 g |   52 +++++++++++++++++++---------------------------------
 1 file changed, 19 insertions(+), 33 deletions(-)

New commits:
commit 994574757dd886d35eae41e4f5bbaaba200282b0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Oct 7 20:34:49 2012 -0500

    be more resilent insuring that hooks are properly setup
    
    Change-Id: Ia74c7d3e29654ad39c666cfe538a45807467c5dd

diff --git a/g b/g
index 2301be6..208b359 100755
--- a/g
+++ b/g
@@ -127,7 +127,7 @@ get_configured_submodules()
 
 do_git_cmd()
 {
-    echo "cmd:$@"
+#    echo "cmd:$@"
     git "$@"
     git submodule foreach git "$@" $KEEP_GOING
 }
@@ -262,38 +262,52 @@ done
 
 shift
 
+rc="0"
+
 case "$COMMAND" in
     branch)
 	do_git_cmd ${COMMAND} "$@"
+	rc="$?"
 	;;
     checkout)
 	do_checkout "$@"
+	rc="$?"
 	;;
     clone)
-	do_init_modules && git submodule update && refresh_all_hooks
+	do_init_modules && git submodule update
+	rc="$?"
+	refresh_all_hooks
         ;;
     fetch)
 	(git fetch "$@" && git submodule foreach git fetch "$@" ) && git submodule update
-
+	rc=$?
+	refresh_all_hooks
 	;;
     grep)
         KEEP_GOING="||:"
 	do_git_cmd ${COMMAND} "$@"
+	rc=$?
 	;;
     pull)
-	git pull "$@" && git submodule update && refresh_all_hooks
+	git pull "$@" && git submodule update
+	rc=$?
+	refresh_all_hooks
 	;;
     push)
 	git submodule foreach git push "$@"
-	if [ "$?" = "0" ] ; then
+	rc=$?
+	if [ "$rc" = "0" ] ; then
 	    git push "$@"
 	fi
 	;;
     reset)
 	do_reset
+	rc=$?
+	refresh_all_hooks
 	;;
     tag)
 	do_git_cmd ${COMMAND} "$@"
+	rc=$?
 	;;
     *)
 	echo "./g does not support command:$COMMAND" 1>&2
commit ca81170b91f601e2a73a0dfa3482ac534ae550eb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Oct 7 20:29:09 2012 -0500

    remove shortcut optimisation, qas not quite reliable

diff --git a/g b/g
index aa53015..2301be6 100755
--- a/g
+++ b/g
@@ -125,32 +125,6 @@ get_configured_submodules()
     fi
 }
 
-do_shortcut_update()
-{
-local module
-local repo
-
-    for module in $SUBMODULES_CONFIGURED ; do
-	if [ ! -d ${module?}/.git ] ; then
-	    case "${module?}" in
-		helcontent2)
-		    if [ -d clone/help/.git ] ; then
-			repo="clone/help/.git"
-		    fi
-		    ;;
-		*)
-		    if [ -d clone/${module?}/.git ] ; then
-			repo="clone/${module?}/.git"
-		    fi
-		    ;;
-	    esac
-	    if [ -n "$repo" ] ; then
-		cp -r "${repo?}" "${module?}/."
-	    fi
-	fi
-    done
-}
-
 do_git_cmd()
 {
     echo "cmd:$@"
@@ -217,8 +191,6 @@ do_init_modules()
 local module
 local configured
 
-    do_shortcut_update
-
     for module in $SUBMODULES_CONFIGURED ; do
 	configured=$(git config --local --get submodule.${module}.url)
 	if [ -z "$configured" ] ; then