projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pack-objects: improve path grouping heuristics.
[git.git]
/
upload-pack.c
diff --git
a/upload-pack.c
b/upload-pack.c
index
3cdf428
..
47560c9
100644
(file)
--- a/
upload-pack.c
+++ b/
upload-pack.c
@@
-46,7
+46,7
@@
static void create_pack_file(void)
if (!pid) {
int i;
int args;
if (!pid) {
int i;
int args;
- char **argv;
+ c
onst c
har **argv;
char *buf;
char **p;
char *buf;
char **p;
@@
-56,9
+56,9
@@
static void create_pack_file(void)
}
else
args = nr_has + nr_needs + 5;
}
else
args = nr_has + nr_needs + 5;
- argv = xmalloc(args * sizeof(char *));
+ p = xmalloc(args * sizeof(char *));
+ argv = (const char **) p;
buf = xmalloc(args * 45);
buf = xmalloc(args * 45);
- p = argv;
dup2(fd[1], 1);
close(0);
dup2(fd[1], 1);
close(0);
@@
-221,6
+221,9
@@
static int send_ref(const char *refname, const unsigned char *sha1)
static char *capabilities = "multi_ack thin-pack";
struct object *o = parse_object(sha1);
static char *capabilities = "multi_ack thin-pack";
struct object *o = parse_object(sha1);
+ if (!o)
+ die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));
+
if (capabilities)
packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
0, capabilities);
if (capabilities)
packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
0, capabilities);