diff --git a/upload-pack.c b/upload-pack.c
index 7e3c437d8e1eaca61ccabb29f3097ba9c5c3732e..3648aae1a777aec4bba77b40b9cf6da484190441 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/poll.h>
#include "cache.h"
#include "refs.h"
#include "pkt-line.h"
#include "cache.h"
#include "refs.h"
#include "pkt-line.h"
/* emergency quit */
fd = 2;
if (fd == 2) {
/* emergency quit */
fd = 2;
if (fd == 2) {
+ /* XXX: are we happy to lose stuff here? */
xwrite(fd, data, sz);
return sz;
}
xwrite(fd, data, sz);
return sz;
}
*cp++ = buffered;
outsz++;
}
*cp++ = buffered;
outsz++;
}
- sz = read(pu_pipe[0], cp,
+ sz = xread(pu_pipe[0], cp,
sizeof(data) - outsz);
if (0 < sz)
;
sizeof(data) - outsz);
if (0 < sz)
;
/* Status ready; we ship that in the side-band
* or dump to the standard error.
*/
/* Status ready; we ship that in the side-band
* or dump to the standard error.
*/
- sz = read(pe_pipe[0], progress,
+ sz = xread(pe_pipe[0], progress,
sizeof(progress));
if (0 < sz)
send_client_data(2, progress, sz);
sizeof(progress));
if (0 < sz)
send_client_data(2, progress, sz);
SHALLOW, NOT_SHALLOW);
while (result) {
struct object *object = &result->item->object;
SHALLOW, NOT_SHALLOW);
while (result) {
struct object *object = &result->item->object;
- if (!(object->flags & CLIENT_SHALLOW)) {
+ if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
packet_write(1, "shallow %s",
sha1_to_hex(object->sha1));
register_shallow(object->sha1);
packet_write(1, "shallow %s",
sha1_to_hex(object->sha1));
register_shallow(object->sha1);
object->flags &= ~CLIENT_SHALLOW;
/* make sure the real parents are parsed */
unregister_shallow(object->sha1);
object->flags &= ~CLIENT_SHALLOW;
/* make sure the real parents are parsed */
unregister_shallow(object->sha1);
+ object->parsed = 0;
parse_commit((struct commit *)object);
parents = ((struct commit *)object)->parents;
while (parents) {
parse_commit((struct commit *)object);
parents = ((struct commit *)object)->parents;
while (parents) {
if (!enter_repo(dir, strict))
die("'%s': unable to chdir or not a git archive", dir);
if (!enter_repo(dir, strict))
die("'%s': unable to chdir or not a git archive", dir);
-
+ if (is_repository_shallow())
+ die("attempt to fetch/clone from a shallow repository");
upload_pack();
return 0;
}
upload_pack();
return 0;
}