]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
also remote prune origin when using --reclone
authorRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 09:06:44 +0000 (11:06 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 09:06:44 +0000 (11:06 +0200)
all

diff --git a/all b/all
index 365ef6864b210dc4c2ac570d6c482249ff1355fb..26c43f2e81de61ccc2a2d030550814baa4977ffa 100755 (executable)
--- a/all
+++ b/all
@@ -950,6 +950,7 @@ case "$cmd" in
                                if $gotomaster; then
                                        if $fetchupstream; then
                                                verbose git fetch origin
+                                               verbose git remote prune origin
                                        fi
                                        verbose git checkout -f "`repobranch "$d"`"
                                        verbose git reset --hard origin/"`repobranch "$d"`"
@@ -961,6 +962,7 @@ case "$cmd" in
                                        upstream="$rem/${bra#refs/heads/}"
                                        if $fetchupstream; then
                                                verbose git fetch "$rem"
+                                               verbose git remote prune "$rem"
                                        fi
                                        if ! git rev-parse "$upstream" >/dev/null 2>&1; then
                                                upstream="origin/`repobranch "$d"`"