Skip to content

send-pack: build list of oids to sent to pack-objects #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kewillford wants to merge 3 commits into from
Closed

send-pack: build list of oids to sent to pack-objects #127

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4238ab
fixup! send-pack: do not check for sha1 file when GVFS_MISSING_OK set
Mar 4, 2019
2f07495
send-pack: build list of oids to sent to pack-objects
Nov 19, 2018
f4e7e49
send-pack: remove unused method feed_object
Nov 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions send-pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "sha1-array.h"
#include "gpg-interface.h"
#include "cache.h"
#include "gvfs.h"

int option_parse_push_signed(const struct option *opt,
const char *arg, int unset)
Expand Down Expand Up @@ -49,15 +48,15 @@ static int send_pack_config(const char *var, const char *value, void *unused)
return 0;
}

static void feed_object(const struct object_id *oid, FILE *fh, int negative)
static void add_to_oid_list(const struct object_id *oid, struct string_list *list, int negative)
{
if (negative && !gvfs_config_is_set(GVFS_MISSING_OK) && !has_sha1_file(oid->hash))
if (negative && !has_sha1_file(oid->hash))
return;

if (negative)
putc('^', fh);
fputs(oid_to_hex(oid), fh);
putc('\n', fh);
string_list_append(list, xstrfmt("^%s", oid_to_hex(oid)));
else
string_list_append(list, oid_to_hex(oid));
}

/*
Expand All @@ -74,6 +73,19 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc
FILE *po_in;
int i;
int rc;
struct string_list oid_list = STRING_LIST_INIT_NODUP;
struct string_list_item *item;

for (i = 0; i < extra->nr; i++)
add_to_oid_list(&extra->oid[i], &oid_list, 1);

while (refs) {
if (!is_null_oid(&refs->old_oid))
add_to_oid_list(&refs->old_oid, &oid_list, 1);
if (!is_null_oid(&refs->new_oid))
add_to_oid_list(&refs->new_oid, &oid_list, 0);
refs = refs->next;
}

argv_array_push(&po.args, "pack-objects");
argv_array_push(&po.args, "--all-progress-implied");
Expand All @@ -100,15 +112,10 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc
* parameters by writing to the pipe.
*/
po_in = xfdopen(po.in, "w");
for (i = 0; i < extra->nr; i++)
feed_object(&extra->oid[i], po_in, 1);

while (refs) {
if (!is_null_oid(&refs->old_oid))
feed_object(&refs->old_oid, po_in, 1);
if (!is_null_oid(&refs->new_oid))
feed_object(&refs->new_oid, po_in, 0);
refs = refs->next;

for_each_string_list_item(item, &oid_list) {
fputs(item->string, po_in);
putc('\n', po_in);
}

fflush(po_in);
Expand All @@ -130,6 +137,7 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc
}

rc = finish_command(&po);
string_list_clear(&oid_list, 0);
if (rc) {
/*
* For a normal non-zero exit, we assume pack-objects wrote
Expand Down