From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Thu, 4 May 2006 21:18:14 +0000 (+0200)
Subject: builtin-push: --all and --tags _are_ explicit refspecs
X-Git-Tag: v1.4.0-rc1~180
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5edbcd8d778d81254d2c8a4229c76c6fa7880407;p=git.git

builtin-push: --all and --tags _are_ explicit refspecs

... so do not get refspecs from remotes/* or the config if one of them
was specified.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-push.c b/builtin-push.c
index 06d06ff31..e53002282 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -72,7 +72,7 @@ static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
 {
 	int n = 0;
 	FILE *f = fopen(git_path("remotes/%s", repo), "r");
-	int has_explicit_refspec = refspec_nr;
+	int has_explicit_refspec = refspec_nr || all || tags;
 
 	if (!f)
 		return -1;
@@ -144,7 +144,7 @@ static int get_config_remotes_uri(const char *repo, const char *uri[MAX_URI])
 	config_repo = repo;
 	config_current_uri = 0;
 	config_uri = uri;
-	config_get_refspecs = !refspec_nr;
+	config_get_refspecs = !(refspec_nr || all || tags);
 
 	git_config(get_remote_config);
 	return config_current_uri;