projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "git-push: avoid falling back on pushing "matching" refs."
[git.git]
/
unpack-objects.c
diff --git
a/unpack-objects.c
b/unpack-objects.c
index
cfd61ae
..
4b5b5cb
100644
(file)
--- a/
unpack-objects.c
+++ b/
unpack-objects.c
@@
-31,12
+31,10
@@
static void * fill(int min)
offset = 0;
}
do {
offset = 0;
}
do {
- int ret = read(0, buffer + len, sizeof(buffer) - len);
+ int ret =
x
read(0, buffer + len, sizeof(buffer) - len);
if (ret <= 0) {
if (!ret)
die("early EOF");
if (ret <= 0) {
if (!ret)
die("early EOF");
- if (errno == EAGAIN || errno == EINTR)
- continue;
die("read error on input: %s", strerror(errno));
}
len += ret;
die("read error on input: %s", strerror(errno));
}
len += ret;
@@
-271,6
+269,8
@@
int main(int argc, char **argv)
setup_git_directory();
setup_git_directory();
+ quiet = !isatty(2);
+
for (i = 1 ; i < argc; i++) {
const char *arg = argv[i];
for (i = 1 ; i < argc; i++) {
const char *arg = argv[i];
@@
-299,14
+299,9
@@
int main(int argc, char **argv)
/* Write the last part of the buffer to stdout */
while (len) {
/* Write the last part of the buffer to stdout */
while (len) {
- int ret = write(1, buffer + offset, len);
- if (
!ret
)
+ int ret =
x
write(1, buffer + offset, len);
+ if (
ret <= 0
)
break;
break;
- if (ret < 0) {
- if (errno == EAGAIN || errno == EINTR)
- continue;
- break;
- }
len -= ret;
offset += ret;
}
len -= ret;
offset += ret;
}