diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:26 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:26 +0900 |
| commit | e12cbeaa624b82bc00d585bb24c8034fbf5f9de2 (patch) | |
| tree | 6eed9588af71c6ba9776f592c3573d88929d1bab /checkout.c | |
| parent | Merge branch 'sb/grep-die-on-unreadable-index' (diff) | |
| parent | fetch: generate ref-prefixes when using a configured refspec (diff) | |
| download | git-e12cbeaa624b82bc00d585bb24c8034fbf5f9de2.tar.gz git-e12cbeaa624b82bc00d585bb24c8034fbf5f9de2.zip | |
Merge branch 'bw/ref-prefix-for-configured-refspec'
"git fetch $there $refspec" that talks over protocol v2 can take
advantage of server-side ref filtering; the code has been extended
so that this mechanism triggers also when fetching with configured
refspec.
* bw/ref-prefix-for-configured-refspec: (38 commits)
fetch: generate ref-prefixes when using a configured refspec
refspec: consolidate ref-prefix generation logic
submodule: convert push_unpushed_submodules to take a struct refspec
remote: convert check_push_refs to take a struct refspec
remote: convert match_push_refs to take a struct refspec
http-push: store refspecs in a struct refspec
transport: remove transport_verify_remote_names
send-pack: store refspecs in a struct refspec
transport: convert transport_push to take a struct refspec
push: convert to use struct refspec
push: check for errors earlier
remote: convert match_explicit_refs to take a struct refspec
remote: convert get_ref_match to take a struct refspec
remote: convert query_refspecs to take a struct refspec
remote: convert apply_refspecs to take a struct refspec
remote: convert get_stale_heads to take a struct refspec
fetch: convert prune_refs to take a struct refspec
fetch: convert get_ref_map to take a struct refspec
fetch: convert do_fetch to take a struct refspec
refspec: remove the deprecated functions
...
Diffstat (limited to 'checkout.c')
| -rw-r--r-- | checkout.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/checkout.c b/checkout.c index ac42630f74..bdefc888ba 100644 --- a/checkout.c +++ b/checkout.c @@ -1,5 +1,6 @@ #include "cache.h" #include "remote.h" +#include "refspec.h" #include "checkout.h" struct tracking_name_data { @@ -12,8 +13,8 @@ struct tracking_name_data { static int check_tracking_name(struct remote *remote, void *cb_data) { struct tracking_name_data *cb = cb_data; - struct refspec query; - memset(&query, 0, sizeof(struct refspec)); + struct refspec_item query; + memset(&query, 0, sizeof(struct refspec_item)); query.src = cb->src_ref; if (remote_find_tracking(remote, &query) || get_oid(query.dst, cb->dst_oid)) { |