Merge branch 'nd/clone-detached' into next

* nd/clone-detached:
  push: do not let configured foreign-vcs permanently clobbered
This commit is contained in:
Junio C Hamano
2012-01-23 16:43:10 -08:00

View File

@@ -204,11 +204,13 @@ static int do_push(const char *repo, int flags)
url_nr = remote->url_nr;
}
if (url_nr) {
const char *configured_foreign_vcs = remote->foreign_vcs;
for (i = 0; i < url_nr; i++) {
struct transport *transport =
transport_get(remote, url[i]);
if (push_with_options(transport, flags))
errs++;
remote->foreign_vcs = configured_foreign_vcs;
}
} else {
struct transport *transport =