remote.c: introduce remote.pushdefault

This new configuration variable defines the default remote to push to,
and overrides `branch.<name>.remote` for all branches.  It is useful
in the typical triangular-workflow setup, where the remote you're
fetching from is different from the remote you're pushing to.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index f79184c0a83170ea54298f2b8ac960372371b0f3..9c6fd4aa014e992def7aa92ba6bfa3df72acf9cf 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -727,9 +727,12 @@ branch.autosetuprebase::
        This option defaults to never.
 
 branch.<name>.remote::
        This option defaults to never.
 
 branch.<name>.remote::

-       When in branch <name>, it tells 'git fetch' and 'git push' which
-       remote to fetch from/push to.  It defaults to `origin` if no remote is
-       configured. `origin` is also used if you are not on any branch.
+       When on branch <name>, it tells 'git fetch' and 'git push'
+       which remote to fetch from/push to.  The remote to push to
+       may be overridden with `remote.pushdefault` (for all branches).
+       If no remote is configured, or if you are not on any branch,
+       it defaults to `origin` for fetching and `remote.pushdefault`
+       for pushing.

 
 branch.<name>.merge::
        Defines, together with branch.<name>.remote, the upstream branch
 
 branch.<name>.merge::
        Defines, together with branch.<name>.remote, the upstream branch


@@ -1898,6 +1901,10 @@ receive.updateserverinfo::
        If set to true, git-receive-pack will run git-update-server-info
        after receiving data from git-push and updating refs.
 
        If set to true, git-receive-pack will run git-update-server-info
        after receiving data from git-push and updating refs.
 

+remote.pushdefault::
+       The remote to push to by default.  Overrides
+       `branch.<name>.remote` for all branches.
+

 remote.<name>.url::
        The URL of a remote repository.  See linkgit:git-fetch[1] or
        linkgit:git-push[1].
 remote.<name>.url::
        The URL of a remote repository.  See linkgit:git-fetch[1] or
        linkgit:git-push[1].

diff --git a/remote.c b/remote.c
index 2b06e222a4c394687648d373cae1b66c9d9d289a..6337e1183bcb8e3517f59ff7eaa25ea1db5615ad 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -389,9 +389,16 @@ static int handle_config(const char *key, const char *value, void *cb)
                        add_instead_of(rewrite, xstrdup(value));
                }
        }
                        add_instead_of(rewrite, xstrdup(value));
                }
        }

+

        if (prefixcmp(key,  "remote."))
                return 0;
        name = key + 7;
        if (prefixcmp(key,  "remote."))
                return 0;
        name = key + 7;

+
+       /* Handle remote.* variables */
+       if (!strcmp(name, "pushdefault"))
+               return git_config_string(&pushremote_name, key, value);
+
+       /* Handle remote.<name>.* variables */

        if (*name == '/') {
                warning("Config remote shorthand cannot begin with '/': %s",
                        name);
        if (*name == '/') {
                warning("Config remote shorthand cannot begin with '/': %s",
                        name);

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index b800a8ea1b1158d2d10a0c46c295ae9035163b45..797b537d8aa0be522c6530ceb000b704fc5a95f9 100755 (executable)
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -497,6 +497,18 @@ test_expect_success 'push with config remote.*.push = HEAD' '
        check_push_result testrepo $the_first_commit heads/local
 '
 
        check_push_result testrepo $the_first_commit heads/local
 '
 

+test_expect_success 'push with remote.pushdefault' '
+       mk_test up_repo heads/master &&
+       mk_test down_repo heads/master &&
+       test_config remote.up.url up_repo &&
+       test_config remote.down.url down_repo &&
+       test_config branch.master.remote up &&
+       test_config remote.pushdefault down &&
+       git push &&
+       check_push_result up_repo $the_first_commit heads/master &&
+       check_push_result down_repo $the_commit heads/master
+'
+

 test_expect_success 'push with config remote.*.pushurl' '
 
        mk_test testrepo heads/master &&
 test_expect_success 'push with config remote.*.pushurl' '
 
        mk_test testrepo heads/master &&