summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-18 12:47:04 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-18 12:47:04 -0700
commit6b5005c88b3a0c360249deb8ca8b92201abaa824 (patch)
tree177a02c572549b4caa5872ef3ecd4275e860b5af /remote.c
parent165dc789d5e201a06e0de5a984e4529ae62027fc (diff)
parent183113a5ca99cb228b2ba0a29e53f1ac11f2c7c2 (diff)
downloadgit-6b5005c88b3a0c360249deb8ca8b92201abaa824.tar.gz
Merge branch 'tf/string-list-init'
* tf/string-list-init: string_list: Add STRING_LIST_INIT macro and make use of it.
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/remote.c b/remote.c
index afbba47460..9143ec7a17 100644
--- a/remote.c
+++ b/remote.c
@@ -754,7 +754,7 @@ int for_each_remote(each_remote_fn fn, void *priv)
void ref_remove_duplicates(struct ref *ref_map)
{
- struct string_list refs = { NULL, 0, 0, 0 };
+ struct string_list refs = STRING_LIST_INIT_NODUP;
struct string_list_item *item = NULL;
struct ref *prev = NULL, *next = NULL;
for (; ref_map; prev = ref_map, ref_map = next) {
@@ -1704,7 +1704,7 @@ static int get_stale_heads_cb(const char *refname,
struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map)
{
struct ref *ref, *stale_refs = NULL;
- struct string_list ref_names = { NULL, 0, 0, 0 };
+ struct string_list ref_names = STRING_LIST_INIT_NODUP;
struct stale_heads_info info;
info.remote = remote;
info.ref_names = &ref_names;