call merge tool properly

[xonotic/div0-gittools.git] / git-recurse

diff --git a/git-recurse b/git-recurse
index 19fbc641293646bb45b595931c0b263d009516ad..17959bdae1215094cf30c65d674d803b946bb5bd 100755 (executable)
--- a/git-recurse
+++ b/git-recurse
@@ -11,6 +11,7 @@ processarg()
        prefix=
        suffix=
        case "$1" in
+               # have to detect some rev-parse syntax
                *..*)
                        first=${1%%..*}
                        rest=${1#*..}
@@ -47,6 +48,7 @@ processarg()
                        first=`processarg "$first"`
                        echo "^$first"
                        ;;
+               # handle foo@@bar so that if foo exists, foo stays, otherwise bar
                *$SEPARATOR*)
                        first=${1%%$SEPARATOR*}
                        rest=${1#*$SEPARATOR}
@@ -56,6 +58,7 @@ processarg()
                                processarg "$rest"
                        fi
                        ;;
+               # other args stay as is
                *)
                        echo "$1"
                        ;;
@@ -72,18 +75,23 @@ processargs()
                fi
                set -- "$@" "`processarg "$X"`"
        done
+       echo >&2 "In `pwd`: $*"
        "$@"
 }
 
+# save stdin
+exec 3<&0
+
 # recurse through all sub-repos
 status=0
-for GITDIR in `find . -type d -name \*.git`; do
+# TODO is there a better way to identify all sub-repos?
+find . -type d -name \*.git -prune | while IFS= read -r GITDIR; do
        # TODO I would LIKE to do this, but then some commands (like pull) fail
        #export GIT_DIR="$GITDIR"
        #export GIT_WORK_TREE="${GITDIR%/.git}"
        # so I will have to chdir instead
 
-       ( cd "$GITDIR/.." && processargs git "$@" )
+       ( cd "$GITDIR/.." && processargs git "$@" <&3 3<&- ) # use restored stdin
        if [ "$?" -gt "$status" ]; then
                status=$?
        fi