summaryrefslogtreecommitdiff
path: root/builtin-upload-archive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-17 22:03:20 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-17 22:03:20 -0800
commite36e6c00cd60130f8792319a5aa0f56d2da68e14 (patch)
treeb78eb47745f965c463898141e4dfff0156cdd9d1 /builtin-upload-archive.c
parentaa17bacc14362dbe076c5ea20531a21dea8677a7 (diff)
parent6b59f51b312f06d9420d34c09fa408c658aac6d2 (diff)
downloadgit-e36e6c00cd60130f8792319a5aa0f56d2da68e14.tar.gz
Merge branch 'np/maint-sideband-favor-status'
* np/maint-sideband-favor-status: give priority to progress messages
Diffstat (limited to 'builtin-upload-archive.c')
-rw-r--r--builtin-upload-archive.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c
index c4cd1e1327..29446e84cc 100644
--- a/builtin-upload-archive.c
+++ b/builtin-upload-archive.c
@@ -132,7 +132,6 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
while (1) {
struct pollfd pfd[2];
- ssize_t processed[2] = { 0, 0 };
int status;
pfd[0].fd = fd1[0];
@@ -147,15 +146,14 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
}
continue;
}
- if (pfd[0].revents & POLLIN)
- /* Data stream ready */
- processed[0] = process_input(pfd[0].fd, 1);
if (pfd[1].revents & POLLIN)
/* Status stream ready */
- processed[1] = process_input(pfd[1].fd, 2);
- /* Always finish to read data when available */
- if (processed[0] || processed[1])
- continue;
+ if (process_input(pfd[1].fd, 2))
+ continue;
+ if (pfd[0].revents & POLLIN)
+ /* Data stream ready */
+ if (process_input(pfd[0].fd, 1))
+ continue;
if (waitpid(writer, &status, 0) < 0)
error_clnt("%s", lostchild);