kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

prune_remote(): initialize both delete_refs lists in a single loop 

Also free them together at the end of the function.

In a moment, the array version will become redundant. Managing them
together makes later steps more obvious.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2014-11-25 09:02:30 +01:00 committed by Junio C Hamano
parent 16d4fa3d96
commit 28d3f214d1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/remote.c
View File

@ -1337,8 +1337,13 @@ static int prune_remote(const char *remote, int dry_run)
: _("(no URL)")); : _("(no URL)"));


delete_refs = xmalloc(states.stale.nr * sizeof(*delete_refs)); delete_refs = xmalloc(states.stale.nr * sizeof(*delete_refs));
for (i = 0; i < states.stale.nr; i++) for (i = 0; i < states.stale.nr; i++) {
delete_refs[i] = states.stale.items[i].util; const char *refname = states.stale.items[i].util;

delete_refs[i] = refname;
string_list_insert(&delete_refs_list, refname);
}

if (!dry_run) { if (!dry_run) {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
if (repack_without_refs(delete_refs, states.stale.nr, if (repack_without_refs(delete_refs, states.stale.nr,
@ -1346,13 +1351,10 @@ static int prune_remote(const char *remote, int dry_run)
result |= error("%s", err.buf); result |= error("%s", err.buf);
strbuf_release(&err); strbuf_release(&err);
} }
free(delete_refs);


for (i = 0; i < states.stale.nr; i++) { for (i = 0; i < states.stale.nr; i++) {
const char *refname = states.stale.items[i].util; const char *refname = states.stale.items[i].util;


string_list_insert(&delete_refs_list, refname);

if (!dry_run) if (!dry_run)
result |= delete_ref(refname, NULL, 0); result |= delete_ref(refname, NULL, 0);


@ -1365,8 +1367,9 @@ static int prune_remote(const char *remote, int dry_run)
} }


warn_dangling_symrefs(stdout, dangling_msg, &delete_refs_list); warn_dangling_symrefs(stdout, dangling_msg, &delete_refs_list);
string_list_clear(&delete_refs_list, 0);


free(delete_refs);
string_list_clear(&delete_refs_list, 0);
free_remote_ref_states(&states); free_remote_ref_states(&states);
return result; return result;
} }