Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
add_branch_for_removal(): don't set "util" field of string_list entries
author
Michael Haggerty
<mhagger@alum.mit.edu>
Mon, 25 May 2015 18:38:42 +0000
(18:38 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 25 May 2015 19:19:30 +0000
(12:19 -0700)
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>
builtin/remote.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
45690a5
)
diff --git
a/builtin/remote.c
b/builtin/remote.c
index 1986e987a56b4bca0ade127e5803bd727834e1e5..ab39fea2b701a8a1530a2b9737862df4be1f719c 100644
(file)
--- 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 branches_for_remote *branches = cb_data;
struct refspec refspec;
- struct string_list_item *item;
struct known_remote *kr;
memset(&refspec, 0, sizeof(refspec));
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));
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;
}
return 0;
}
@@
-828,7
+825,7
@@
static int rm(int argc, const char **argv)
if (!result)
result = remove_branches(&branches);
if (!result)
result = remove_branches(&branches);
- string_list_clear(&branches,
1
);
+ string_list_clear(&branches,
0
);
if (skipped.nr) {
fprintf_ln(stderr,
if (skipped.nr) {
fprintf_ln(stderr,