push: do not let configured foreign-vcs permanently clobbered
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jan 2012 00:34:22 +0000 (16:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jan 2012 00:38:42 +0000 (16:38 -0800)
commitdad0b3d8e5586ff8c901a6bd643ea9bfe55d75a7
tree36d96412024dca457a308bf0dc282a853f28d27f
parent2857093ba15982d21ff0d5a9fd65294ac895cb67
push: do not let configured foreign-vcs permanently clobbered

Recently, 6f48d39 (clone: delay cloning until after remote HEAD checking,
2012-01-16) tried to record if a remote helper needs to be called after
parsing the remote when transport_get() is called, by overwriting the
field meant to store the configured remote helper name in the remote
structure.

This is OK when a remote represents a single remote repository, but fails
miserably when pushing to locations with multiple URLs, like this:

    $ cat .git/config
    [remote "origin"]
        url = https://code.google.com/p/git-htmldocs/
        url = github.com:gitster/git-htmldocs.git
        push = refs/heads/master:refs/heads/master
    $ git push

The second url that is supposed to use the git-over-ssh transport
mistakenly use https:// and fails with:

    error: Couldn't resolve host 'github.com:gitster' while accessing
    github.com:gitster/git-htmldocs.git/info/refs
    fatal: HTTP request failed

The right solution would probably be to dedicate a separate field to store
the detected external helper to be used, which is valid only during a
single use of transport until it is disconnected, instead of overwriting
foreign_vcs field, but in the meantime, this band-aid should suffice.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/push.c