[Libreoffice-commits] .: 2 commits - g solenv/bin

[Bjoern Michaelsen]

 g |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 95b96b4853c94ae45b7fd8e34786152773b80440
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Mar 7 14:55:10 2011 +0100

    solenv/bin/subsequenttests is intended to be executable

diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
old mode 100644
new mode 100755
commit da31fa7cab8941f978554f390cba2ff3c0457297
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Mar 7 14:53:08 2011 +0100

    teach ./g at least some basic manners when using commit -F
    
     * still needs fixes for message files with relative paths

diff --git a/g b/g
index a440d65..a37943a 100755
--- a/g
+++ b/g
@@ -105,10 +105,16 @@ while shift ; do
             FILES[$FILESNUM]="$1"
             FILESNUM=$(($FILESNUM+1))
         else
-            [ "$COMMAND" = "commit" -a "$PARAM" = "--allow-empty" ] && ALLOW_EMPTY=1
-
-            FILES[$FILESNUM]="$PARAM"
-            FILESNUM=$(($FILESNUM+1))
+            if [ "$COMMAND" = "commit" -a "$PARAM" = "-F" ]
+            then
+                shift
+                # this still needs some magic to handle relative paths
+                EXTRA="${EXTRA} -F ${1}"
+            else
+                [ "$COMMAND" = "commit" -a "$PARAM" = "--allow-empty" ] && ALLOW_EMPTY=1
+                FILES[$FILESNUM]="$PARAM"
+                FILESNUM=$(($FILESNUM+1))
+            fi
         fi
     else
         if [ "$COMMAND" = "apply" ] ; then
@@ -225,6 +231,7 @@ for REPO in $DIRS ; do
             # do it!
 	    if [ "$COMMAND" != "clone" -o ! -d $DIR ] ; then
                 [ "$REPORT_REPOS" = "1" ] && echo "===== $NAME ====="
+                echo git $PAGER "$COMMAND" $EXTRA "${FILES[@]}"
                 git $PAGER "$COMMAND" $EXTRA "${FILES[@]}"
                 RETURN=$?
 	    fi