undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prune_remote(): iterate using for_each_string_list_item()

Browse Source 
Iterate over refs_to_prune using for_each_string_list_item() rather
than writing out the loop in longhand.

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>
This commit is contained in:
Michael Haggerty 2014-11-25 09:02:34 +01:00 committed by Junio C Hamano
parent fcce0da975
commit 8552943f41
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/remote.c
View File

@ -1309,9 +1309,10 @@ static int set_head(int argc, const char **argv)
static int prune_remote(const char *remote, int dry_run) static int prune_remote(const char *remote, int dry_run)
{ {
int result = 0, i; int result = 0;
struct ref_states states; struct ref_states states;
struct string_list refs_to_prune = STRING_LIST_INIT_NODUP; struct string_list refs_to_prune = STRING_LIST_INIT_NODUP;
struct string_list_item *item;
const char *dangling_msg = dry_run const char *dangling_msg = dry_run
? _(" %s will become dangling!") ? _(" %s will become dangling!")
: _(" %s has become dangling!"); : _(" %s has become dangling!");
@ -1330,11 +1331,8 @@ static int prune_remote(const char *remote, int dry_run)
? states.remote->url[0] ? states.remote->url[0]
: _("(no URL)")); : _("(no URL)"));
for (i = 0; i < states.stale.nr; i++) { for_each_string_list_item(item, &states.stale)
const char *refname = states.stale.items[i].util; string_list_append(&refs_to_prune, item->util);
string_list_append(&refs_to_prune, refname);
}
sort_string_list(&refs_to_prune); sort_string_list(&refs_to_prune);
if (!dry_run) { if (!dry_run) {
@ -1344,8 +1342,8 @@ static int prune_remote(const char *remote, int dry_run)
strbuf_release(&err); strbuf_release(&err);
} }
for (i = 0; i < states.stale.nr; i++) { for_each_string_list_item(item, &states.stale) {
const char *refname = states.stale.items[i].util; const char *refname = item->util;
if (!dry_run) if (!dry_run)
result |= delete_ref(refname, NULL, 0); result |= delete_ref(refname, NULL, 0);