X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=branch.c;h=f967c98f6324c49d9ab7f94f973230512af13707;hb=cdd9311290096752288ed25ce71db8d3b2e2dddd;hp=2672054f0b5423cd09010302285935650435f1dc;hpb=c988f6425acbd9765c55490c45d61f7531d5d83b;p=thirdparty%2Fgit.git diff --git a/branch.c b/branch.c index 2672054f0b..f967c98f63 100644 --- a/branch.c +++ b/branch.c @@ -3,12 +3,13 @@ #include "config.h" #include "branch.h" #include "refs.h" +#include "refspec.h" #include "remote.h" #include "commit.h" #include "worktree.h" struct tracking { - struct refspec spec; + struct refspec_item spec; char *src; const char *remote; int matches; @@ -218,8 +219,8 @@ int validate_new_branchname(const char *name, struct strbuf *ref, int force) static int check_tracking_branch(struct remote *remote, void *cb_data) { char *tracking_branch = cb_data; - struct refspec query; - memset(&query, 0, sizeof(struct refspec)); + struct refspec_item query; + memset(&query, 0, sizeof(struct refspec_item)); query.dst = tracking_branch; return !remote_find_tracking(remote, &query); }