From aace29890daa2fa947c0a4f50f0a4eb1a3b0a320 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 4 Oct 2010 15:30:03 +0200 Subject: [PATCH] improve cleaning --- all | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/all b/all index c53631dc..be7c976a 100755 --- a/all +++ b/all @@ -335,11 +335,26 @@ case "$cmd" in verbose fix_upstream_rebase_mergefail && verbose fix_upstream_rebase_mergeok done ;; + fix_config) + for d in $repos; do + url=`repourl "$d"` + pushurl=`repopushurl "$d"` + branch=`repobranch "$d"` + if [ -d "$d0/$d" ]; then + enter "$d0/$d" verbose + fix_git_config "$url" "$pushurl" + cd "$d0" + fi + done + ;; update|pull) allow_pull=true if [ x"$1" = x"-N" ]; then allow_pull=false fi + if $allow_pull; then + "$SELF" fix_config + fi for d in $repos; do url=`repourl "$d"` pushurl=`repopushurl "$d"` @@ -347,7 +362,6 @@ case "$cmd" in if [ -d "$d0/$d" ]; then if $allow_pull; then enter "$d0/$d" verbose - fix_git_config "$url" "$pushurl" r=`git symbolic-ref HEAD` r=${r#refs/heads/} if git config branch.$r.remote >/dev/null 2>&1; then @@ -949,6 +963,8 @@ case "$cmd" in echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt ;; clean) + "$SELF" fix_config + "$SELF" update -N force=false gotoupstream=false fetchupstream=false -- 2.39.2