git/builtin/fetch-pack.c, branch v1.8.2.2

fetch-pack: move core code to libgit.a

2012-10-29T07:40:29Z

fetch_pack() is used by transport.c, part of libgit.a while it stays in builtin/fetch-pack.c. Move it to fetch-pack.c so that we won't get undefined reference if a program that uses libgit.a happens to pull it in. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Jeff King

fetch-pack: remove global (static) configuration variable "args"

2012-10-29T07:08:30Z

This helps removes the hack in fetch_pack() that copies my_args to args. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Jeff King

fetch-pack: eliminate spurious error messages

2012-09-12T18:46:32Z

It used to be that if "--all", "--depth", and also explicit references were sought, then the explicit references were not handled correctly in filter_refs() because the "--all --depth" code took precedence over the explicit reference handling, and the explicit references were never noted as having been found. So check for explicitly sought references before proceeding to the "--all --depth" logic. This fixes two test cases in t5500. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

cmd_fetch_pack(): simplify computation of return value

2012-09-12T18:46:32Z

Set the final value at initialization rather than initializing it then sometimes changing it. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

fetch-pack: report missing refs even if no existing refs were received

2012-09-12T18:46:32Z

This fixes a test in t5500. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

cmd_fetch_pack(): return early if finish_connect() fails

2012-09-12T18:46:31Z

This simplifies the logic without changing the behavior. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

filter_refs(): simplify logic

2012-09-12T18:46:31Z

Simplify flow within loop: first decide whether to keep the reference, then keep/free it. This makes it clearer that each ref has exactly two possible destinies, and removes duplication of the code for appending the reference to the linked list. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

filter_refs(): build refs list as we go

2012-09-12T18:46:31Z

Instead of temporarily storing matched refs to temporary array "return_refs", simply append them to newlist as we go. This changes the order of references in newlist to strictly sorted if "--all" and "--depth" and named references are all specified, but that usage is broken anyway (see the last two tests in t5500). This changes the last test in t5500 from segfaulting into just emitting a spurious error (this will be fixed in a moment). Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

filter_refs(): delete matched refs from sought list

2012-09-12T18:46:31Z

Remove any references that are available from the remote from the sought list (rather than overwriting their names with NUL characters, as previously). Mark matching entries by writing a non-NULL pointer to string_list_item::util during the iteration, then use filter_string_list() later to filter out the entries that have been marked. Document this aspect of fetch_pack() in a comment in the header file. (More documentation is obviously still needed.) Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

fetch_pack(): update sought->nr to reflect number of unique entries

2012-09-12T18:46:31Z

fetch_pack() removes duplicates from the "sought" list, thereby shrinking the list. But previously, the caller was not informed about the shrinkage. This would cause a spurious error message to be emitted by cmd_fetch_pack() if "git fetch-pack" is called with duplicate refnames. Instead, remove duplicates using string_list_remove_duplicates(), which adjusts sought->nr to reflect the new length of the list. The last test of t5500 inexplicably *required* "git fetch-pack" to fail when fetching a list of references that contains duplicates; i.e., it insisted on the buggy behavior. So change the test to expect the correct behavior. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano