X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=send-pack.c;h=af93b11f238e4583f6e7fb9dab5a2224acf4ee1f;hp=f5583861433517527943dcefb3320e923fe634a0;hb=HEAD;hpb=207a1f3ce9894ad6fab59077b9cec1adc70ed6c5 diff --git a/send-pack.c b/send-pack.c index f5583861..af93b11f 100644 --- a/send-pack.c +++ b/send-pack.c @@ -27,7 +27,7 @@ static int is_zero_sha1(const unsigned char *sha1) static void exec_pack_objects(void) { - static char *args[] = { + static const char *args[] = { "pack-objects", "--stdout", NULL @@ -39,7 +39,7 @@ static void exec_pack_objects(void) static void exec_rev_list(struct ref *refs) { struct ref *ref; - static char *args[1000]; + static const char *args[1000]; int i = 0, j; args[i++] = "rev-list"; /* 0 */ @@ -151,12 +151,12 @@ static int ref_newer(const unsigned char *new_sha1, * old. Otherwise we require --force. */ o = deref_tag(parse_object(old_sha1), NULL, 0); - if (!o || o->type != commit_type) + if (!o || o->type != TYPE_COMMIT) return 0; old = (struct commit *) o; o = deref_tag(parse_object(new_sha1), NULL, 0); - if (!o || o->type != commit_type) + if (!o || o->type != TYPE_COMMIT) return 0; new = (struct commit *) o; @@ -362,6 +362,8 @@ int main(int argc, char **argv) pid_t pid; setup_git_directory(); + git_config(git_default_config); + argv++; for (i = 1; i < argc; i++, argv++) { char *arg = *argv;