summaryrefslogtreecommitdiff
path: root/builtin/pull.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 /builtin/pull.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 'builtin/pull.c')
-rw-r--r--builtin/pull.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 6247c95..5a79dea 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -676,7 +676,7 @@ static const char *get_upstream_branch(const char *remote)
*/
static const char *get_tracking_branch(const char *remote, const char *refspec)
{
- struct refspec *spec;
+ struct refspec_item *spec;
const char *spec_src;
const char *merge_branch;