From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 16 Oct 2007 04:25:34 +0000 (-0400)
Subject: Fix 'push --all branch...' error handling
X-Git-Tag: v1.5.4-rc0~292^2~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18184f79dbf70e157399ba2288f7045582fd61c6;p=git.git

Fix 'push --all branch...' error handling

The builtin-fetch topic changed push's handling of --all to setting
the new TRANSPORT_PUSH_ALL flag before starting the push subroutine
for the given transport.  Unfortunately not all references within
builtin-push were changed to test this flag therefore allowing push
to incorrectly accept refspecs and --all.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/builtin-push.c b/builtin-push.c
index a552f0dac..4b39ef385 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -10,7 +10,7 @@
 
 static const char push_usage[] = "git-push [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]";
 
-static int all, thin, verbose;
+static int thin, verbose;
 static const char *receivepack;
 
 static const char **refspec;
@@ -52,7 +52,9 @@ static int do_push(const char *repo, int flags)
 	if (!remote)
 		die("bad repository '%s'", repo);
 
-	if (!refspec && !all && remote->push_refspec_nr) {
+	if (!refspec
+		&& !(flags & TRANSPORT_PUSH_ALL)
+		&& remote->push_refspec_nr) {
 		refspec = remote->push_refspec;
 		refspec_nr = remote->push_refspec_nr;
 	}
@@ -138,7 +140,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 		usage(push_usage);
 	}
 	set_refspecs(argv + i, argc - i);
-	if (all && refspec)
+	if ((flags & TRANSPORT_PUSH_ALL) && refspec)
 		usage(push_usage);
 
 	return do_push(repo, flags);