diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-09 13:38:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-09 13:38:41 -0700 |
| commit | 00fb2d25632191b89ac4144e1a6498470a4a1c9e (patch) | |
| tree | 755828b1eade4aa2ca7077f200221c13255da762 /remote-curl.c | |
| parent | fc2d99f1e95252dcd3eb645a370a658bea7fd5bd (diff) | |
| parent | d202a513a4d377d3ea319bb1c5c7ae0548a3b581 (diff) | |
| download | git-00fb2d25632191b89ac4144e1a6498470a4a1c9e.tar.gz git-00fb2d25632191b89ac4144e1a6498470a4a1c9e.tar.xz | |
Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8
* cb/maint-t5541-make-server-port-portable:
t5541: check error message against the real port number used
remote-curl: Fix push status report when all branches fail
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/remote-curl.c b/remote-curl.c index 48c20b86f..25c1af7ab 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -805,7 +805,7 @@ static int push(int nr_spec, char **specs) static void parse_push(struct strbuf *buf) { char **specs = NULL; - int alloc_spec = 0, nr_spec = 0, i; + int alloc_spec = 0, nr_spec = 0, i, ret; do { if (!prefixcmp(buf->buf, "push ")) { @@ -822,12 +822,13 @@ static void parse_push(struct strbuf *buf) break; } while (1); - if (push(nr_spec, specs)) - exit(128); /* error already reported */ - + ret = push(nr_spec, specs); printf("\n"); fflush(stdout); + if (ret) + exit(128); /* error already reported */ + free_specs: for (i = 0; i < nr_spec; i++) free(specs[i]); |