summaryrefslogtreecommitdiff
path: root/branch.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2018-05-16 22:57:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-17 21:19:41 (GMT)
commit0ad4a5ff50dbc839ae26aa60c03b55bf416b6000 (patch)
treed57cea89eb1cf8d6d3a063278540a6268d5be479 /branch.c
parentec0cb496553ac82f97205a415ca77618406b30e3 (diff)
downloadgit-0ad4a5ff50dbc839ae26aa60c03b55bf416b6000.zip
git-0ad4a5ff50dbc839ae26aa60c03b55bf416b6000.tar.gz
git-0ad4a5ff50dbc839ae26aa60c03b55bf416b6000.tar.bz2
refspec: rename struct refspec to struct refspec_item
In preparation for introducing an abstraction around a collection of refspecs (much like how a 'struct pathspec' is a collection of 'struct pathspec_item's) rename the existing 'struct refspec' to 'struct refspec_item'. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.c')
-rw-r--r--branch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/branch.c b/branch.c
index 32ccefc..f967c98 100644
--- a/branch.c
+++ b/branch.c
@@ -9,7 +9,7 @@
#include "worktree.h"
struct tracking {
- struct refspec spec;
+ struct refspec_item spec;
char *src;
const char *remote;
int matches;
@@ -219,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);
}