remote.c: introduce branch.<name>.pushremote

This new configuration variable overrides `remote.pushdefault` and
`branch.<name>.remote` for pushes.  When you pull from one
place (e.g. your upstream) and push to another place (e.g. your own
publishing repository), you would want to set `remote.pushdefault` to
specify the remote to push to for all branches, and use this option to
override it for a specific branch.

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 9c6fd4aa014e992def7aa92ba6bfa3df72acf9cf..3d750e0452308a4d3bf15053bfc5131d43c8c913 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -730,9 +730,19 @@ branch.<name>.remote::
        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).
        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.
+       The remote to push to, for the current branch, may be further
+       overridden by `branch.<name>.pushremote`.  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>.pushremote::
+       When on branch <name>, it overrides `branch.<name>.remote` for
+       pushing.  It also overrides `remote.pushdefault` for pushing
+       from branch <name>.  When you pull from one place (e.g. your
+       upstream) and push to another place (e.g. your own publishing
+       repository), you would want to set `remote.pushdefault` to
+       specify the remote to push to for all branches, and use this
+       option to override it for a specific branch.

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


@@ -1903,7 +1913,8 @@ receive.updateserverinfo::
 
 remote.pushdefault::
        The remote to push to by default.  Overrides
 
 remote.pushdefault::
        The remote to push to by default.  Overrides

-       `branch.<name>.remote` for all branches.
+       `branch.<name>.remote` for all branches, and is overridden by
+       `branch.<name>.pushremote` for specific branches.

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

diff --git a/remote.c b/remote.c
index 6337e1183bcb8e3517f59ff7eaa25ea1db5615ad..68eb99bdf0ca3fedd02ab1bc93db7549b21b62d4 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -364,6 +364,10 @@ static int handle_config(const char *key, const char *value, void *cb)
                                default_remote_name = branch->remote_name;
                                explicit_default_remote_name = 1;
                        }
                                default_remote_name = branch->remote_name;
                                explicit_default_remote_name = 1;
                        }

+               } else if (!strcmp(subkey, ".pushremote")) {
+                       if (branch == current_branch)
+                               if (git_config_string(&pushremote_name, key, value))
+                                       return -1;

                } else if (!strcmp(subkey, ".merge")) {
                        if (!value)
                                return config_error_nonbool(key);
                } else if (!strcmp(subkey, ".merge")) {
                        if (!value)
                                return config_error_nonbool(key);

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 797b537d8aa0be522c6530ceb000b704fc5a95f9..7bf1555cacabdfaf0a2cce804c1b08e85bdce02b 100755 (executable)
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -519,6 +519,21 @@ test_expect_success 'push with config remote.*.pushurl' '
        check_push_result testrepo $the_commit heads/master
 '
 
        check_push_result testrepo $the_commit heads/master
 '
 

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

 test_expect_success 'push with dry-run' '
 
        mk_test testrepo heads/master &&
 test_expect_success 'push with dry-run' '
 
        mk_test testrepo heads/master &&