summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-05-25 18:38:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-25 19:19:30 (GMT)
commite26cdf91c1a836045bcafa3f970b47c0967f3062 (patch)
tree5de73525d6587f5f71b78cc225bb7933d7cdc98e /builtin
parent45690a57a3aaba862a66096f3ebdf9a412643cf1 (diff)
downloadgit-e26cdf91c1a836045bcafa3f970b47c0967f3062.zip
git-e26cdf91c1a836045bcafa3f970b47c0967f3062.tar.gz
git-e26cdf91c1a836045bcafa3f970b47c0967f3062.tar.bz2
add_branch_for_removal(): don't set "util" field of string_list entries
They were never used. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/remote.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index 1986e98..ab39fea 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -513,7 +513,6 @@ static int add_branch_for_removal(const char *refname,
{
struct branches_for_remote *branches = cb_data;
struct refspec refspec;
- struct string_list_item *item;
struct known_remote *kr;
memset(&refspec, 0, sizeof(refspec));
@@ -543,9 +542,7 @@ static int add_branch_for_removal(const char *refname,
if (flags & REF_ISSYMREF)
return unlink(git_path("%s", refname));
- item = string_list_append(branches->branches, refname);
- item->util = xmalloc(20);
- hashcpy(item->util, oid->hash);
+ string_list_append(branches->branches, refname);
return 0;
}
@@ -828,7 +825,7 @@ static int rm(int argc, const char **argv)
if (!result)
result = remove_branches(&branches);
- string_list_clear(&branches, 1);
+ string_list_clear(&branches, 0);
if (skipped.nr) {
fprintf_ln(stderr,