adminmerge real fix ;)

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 17314d90718e1024db3101404ff9e3a449d994e1..cf7e101d3472e7fd9cf697583f5b1994d7173508 100755 (executable)
--- a/all
+++ b/all
@@ -562,6 +562,9 @@ case "$cmd" in
                rm -rf "$patchdir"
                ;;
        admin-merge)
+               if [ "$#" = 1 ]; then
+                       set -- "${1%%/*}" "${1#*/}"
+               fi
                for d in $repos; do
                        enter "$d0/$d" verbose
                        git rev-parse "$1/$2" || continue