development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc/upload-pack-v2-fetch-fix'

Browse source 
Serving a "git fetch" client over "git://" and "ssh://" protocols
using the on-wire protocol version 2 was buggy on the server end
when the client needs to make a follow-up request to
e.g. auto-follow tags.

* cc/upload-pack-v2-fetch-fix:
  upload-pack: clear filter_options for each v2 fetch command
This commit is contained in:
Junio C Hamano 2020-05-13 12:19:21 -07:00
parent ce1adb1157 08450ef791
commit a0125885f5
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
t/t5616-partial-clone.sh
View file

@ -384,12 +384,11 @@ test_expect_success 'fetch lazy-fetches only to resolve deltas, protocol v2' '
grep "want $(cat hash)" trace
'
# The following two tests must be in this order, or else
# the first will not fail. It is important that the srv.bare
# repository did not have tags during clone, but has tags
# The following two tests must be in this order. It is important that
# the srv.bare repository did not have tags during clone, but has tags
# in the fetch.
test_expect_failure 'verify fetch succeeds when asking for new tags' '
test_expect_success 'verify fetch succeeds when asking for new tags' '
git clone --filter=blob:none "file://$(pwd)/srv.bare" tag-test &&
for i in I J K
do

34
upload-pack.c
View file

@ -69,7 +69,6 @@ static const char *pack_objects_hook;
static int filter_capability_requested;
static int allow_filter;
static int allow_ref_in_want;
static struct list_objects_filter_options filter_options;
static int allow_sideband_all;
@ -104,7 +103,8 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
}
static void create_pack_file(const struct object_array *have_obj,
const struct object_array *want_obj)
const struct object_array *want_obj,
struct list_objects_filter_options *filter_options)
{
struct child_process pack_objects = CHILD_PROCESS_INIT;
char data[8193], progress[128];
@ -141,9 +141,9 @@ static void create_pack_file(const struct object_array *have_obj,
argv_array_push(&pack_objects.args, "--delta-base-offset");
if (use_include_tag)
argv_array_push(&pack_objects.args, "--include-tag");
if (filter_options.choice) {
if (filter_options->choice) {
const char *spec =
expand_list_objects_filter_spec(&filter_options);
expand_list_objects_filter_spec(filter_options);
if (pack_objects.use_shell) {
struct strbuf buf = STRBUF_INIT;
sq_quote_buf(&buf, spec);
@ -849,7 +849,9 @@ static int process_deepen_not(const char *line, struct string_list *deepen_not,
return 0;
}
static void receive_needs(struct packet_reader *reader, struct object_array *want_obj)
static void receive_needs(struct packet_reader *reader,
struct object_array *want_obj,
struct list_objects_filter_options *filter_options)
{
struct object_array shallows = OBJECT_ARRAY_INIT;
struct string_list deepen_not = STRING_LIST_INIT_DUP;
@ -884,8 +886,8 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan
if (skip_prefix(reader->line, "filter ", &arg)) {
if (!filter_capability_requested)
die("git upload-pack: filtering capability not negotiated");
list_objects_filter_die_if_populated(&filter_options);
parse_list_objects_filter(&filter_options, arg);
list_objects_filter_die_if_populated(filter_options);
parse_list_objects_filter(filter_options, arg);
continue;
}
@ -1088,11 +1090,14 @@ void upload_pack(struct upload_pack_options *options)
struct string_list symref = STRING_LIST_INIT_DUP;
struct object_array want_obj = OBJECT_ARRAY_INIT;
struct packet_reader reader;
struct list_objects_filter_options filter_options;
stateless_rpc = options->stateless_rpc;
timeout = options->timeout;
daemon_mode = options->daemon_mode;
memset(&filter_options, 0, sizeof(filter_options));
git_config(upload_pack_config, NULL);
head_ref_namespaced(find_symref, &symref);
@ -1115,12 +1120,14 @@ void upload_pack(struct upload_pack_options *options)
PACKET_READ_CHOMP_NEWLINE |
PACKET_READ_DIE_ON_ERR_PACKET);
receive_needs(&reader, &want_obj);
receive_needs(&reader, &want_obj, &filter_options);
if (want_obj.nr) {
struct object_array have_obj = OBJECT_ARRAY_INIT;
get_common_commits(&reader, &have_obj, &want_obj);
create_pack_file(&have_obj, &want_obj);
create_pack_file(&have_obj, &want_obj, &filter_options);
}
list_objects_filter_release(&filter_options);
}
struct upload_pack_data {
@ -1135,6 +1142,8 @@ struct upload_pack_data {
int deepen_rev_list;
int deepen_relative;
struct list_objects_filter_options filter_options;
struct packet_writer writer;
unsigned stateless_rpc : 1;
@ -1170,6 +1179,7 @@ static void upload_pack_data_clear(struct upload_pack_data *data)
oid_array_clear(&data->haves);
object_array_clear(&data->shallows);
string_list_clear(&data->deepen_not, 0);
list_objects_filter_release(&data->filter_options);
}
static int parse_want(struct packet_writer *writer, const char *line,
@ -1307,8 +1317,8 @@ static void process_args(struct packet_reader *request,
}
if (allow_filter && skip_prefix(arg, "filter ", &p)) {
list_objects_filter_die_if_populated(&filter_options);
parse_list_objects_filter(&filter_options, p);
list_objects_filter_die_if_populated(&data->filter_options);
parse_list_objects_filter(&data->filter_options, p);
continue;
}
@ -1515,7 +1525,7 @@ int upload_pack_v2(struct repository *r, struct argv_array *keys,
send_shallow_info(&data, &want_obj);
packet_writer_write(&data.writer, "packfile\n");
create_pack_file(&have_obj, &want_obj);
create_pack_file(&have_obj, &want_obj, &data.filter_options);
state = FETCH_DONE;
break;
case FETCH_DONE: