summaryrefslogtreecommitdiff
path: root/builtin-push.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-02 11:49:59 -0700
committerJunio C Hamano <junkio@cox.net>2006-10-02 11:49:59 -0700
commitff989b8d466ee2ec42c69c02e6551add430b8497 (patch)
tree50c0ef99605ec0967156a3d2074dd27bdd4655d2 /builtin-push.c
parent367337040d8d39294bf676672dfefc542717195b (diff)
parent7a21632fa346df58d94d32f09625025931ef13ec (diff)
downloadgit-ff989b8d466ee2ec42c69c02e6551add430b8497.tar.gz
Merge branch 'master' into lj/refs
* master: (99 commits) lock_ref_sha1_basic does not remove empty directories on BSD git-push: .git/remotes/ file does not require SP after colon git-mv: invalidate the removed path properly in cache-tree Makefile: install and clean merge-recur, still. GIT 1.4.3-rc1 gitweb: tree view: hash_base and hash are now context sensitive git-diff -B output fix. fetch: Reset remote refs list each time fetch_main is called Remove -fPIC which was only needed for Git.xs Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34 git-diff -B output fix. Make cvsexportcommit remove files. diff --stat: ensure at least one '-' for deletions, and one '+' for additions diff --stat=width[,name-width]: allow custom diffstat output width. gitweb: History: blob and tree are first, then commitdiff, etc gitweb: Remove redundant "commit" from history http/ftp: optionally ask curl to not use EPSV command gitweb: Don't use quotemeta on internally generated strings gitweb: Add snapshot to shortlog gitweb: Factor out gitweb_have_snapshot() ...
Diffstat (limited to 'builtin-push.c')
-rw-r--r--builtin-push.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-push.c b/builtin-push.c
index 581c44ba8e..5f7eccf14b 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -78,12 +78,12 @@ static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
int is_refspec;
char *s, *p;
- if (!strncmp("URL: ", buffer, 5)) {
+ if (!strncmp("URL:", buffer, 4)) {
is_refspec = 0;
- s = buffer + 5;
- } else if (!strncmp("Push: ", buffer, 6)) {
+ s = buffer + 4;
+ } else if (!strncmp("Push:", buffer, 5)) {
is_refspec = 1;
- s = buffer + 6;
+ s = buffer + 5;
} else
continue;