mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'rs/remote-mv-leakfix'
Leakfix. * rs/remote-mv-leakfix: remote: clear string_list after use in mv()
This commit is contained in:
commit
11ea82ae37
|
@ -566,7 +566,7 @@ static int read_remote_branches(const char *refname,
|
|||
|
||||
strbuf_addf(&buf, "refs/remotes/%s/", rename->old_name);
|
||||
if (starts_with(refname, buf.buf)) {
|
||||
item = string_list_append(rename->remote_branches, xstrdup(refname));
|
||||
item = string_list_append(rename->remote_branches, refname);
|
||||
symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING,
|
||||
NULL, &flag);
|
||||
if (symref && (flag & REF_ISSYMREF))
|
||||
|
@ -612,7 +612,7 @@ static int mv(int argc, const char **argv)
|
|||
struct remote *oldremote, *newremote;
|
||||
struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT,
|
||||
old_remote_context = STRBUF_INIT;
|
||||
struct string_list remote_branches = STRING_LIST_INIT_NODUP;
|
||||
struct string_list remote_branches = STRING_LIST_INIT_DUP;
|
||||
struct rename_info rename;
|
||||
int i, refspec_updated = 0;
|
||||
|
||||
|
@ -734,6 +734,7 @@ static int mv(int argc, const char **argv)
|
|||
if (create_symref(buf.buf, buf2.buf, buf3.buf))
|
||||
die(_("creating '%s' failed"), buf.buf);
|
||||
}
|
||||
string_list_clear(&remote_branches, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue