Revision 69310a34cb6dcca32b08cf3ea9e91ab19354a874 authored by Junio C Hamano on 22 December 2005, 20:39:39 UTC, committed by Junio C Hamano on 22 December 2005, 20:39:39 UTC
Wnen refusing to push a head, we said cryptic "remote 'branch' object X does not exist on local" or "remote ref 'branch' is not a strict subset of local ref 'branch'". That was gittish. Since the most likely reason this happens is because the pushed head was not up-to-date, clarify the error message to say that straight, and suggest pulling first. First noticed by Johannes and seconded by Andreas. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 7246ed4
copy.c
#include "cache.h"
int copy_fd(int ifd, int ofd)
{
while (1) {
int len;
char buffer[8192];
char *buf = buffer;
len = xread(ifd, buffer, sizeof(buffer));
if (!len)
break;
if (len < 0) {
int read_error;
read_error = errno;
close(ifd);
return error("copy-fd: read returned %s",
strerror(read_error));
}
while (len) {
int written = xwrite(ofd, buf, len);
if (written > 0) {
buf += written;
len -= written;
}
else if (!written)
return error("copy-fd: write returned 0");
else
return error("copy-fd: write returned %s",
strerror(errno));
}
}
close(ifd);
return 0;
}
Computing file changes ...