From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramkumar Ramachandra Subject: [PATCH 6/6] remote.c: introduce branch..pushremote Date: Wed, 20 Mar 2013 18:15:01 +0530 Message-ID: <1363783501-27981-7-git-send-email-artagnon@gmail.com> References: <1363783501-27981-1-git-send-email-artagnon@gmail.com> Cc: Junio C Hamano , Jeff King , Eric Sunshine , Jonathan Nieder To: Git List X-From: git-owner@vger.kernel.org Wed Mar 20 13:44:48 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UIINq-0001vz-N5 for gcvg-git-2@plane.gmane.org; Wed, 20 Mar 2013 13:44:47 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932974Ab3CTMoR (ORCPT ); Wed, 20 Mar 2013 08:44:17 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:52997 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932496Ab3CTMoP (ORCPT ); Wed, 20 Mar 2013 08:44:15 -0400 Received: by mail-pb0-f46.google.com with SMTP id uo15so1333717pbc.19 for ; Wed, 20 Mar 2013 05:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=yZQbDtyfSflQ8GZv4hP5AX9sQeYa4PobaPbd+e/JNAc=; b=h07/SGIw8Y8MUsAIkXuxc+TtWwRUD9xMXuacdf63unC+h8P9J0GisOzok+g0YeuWNv c0jndRXtx5TAny/qseiFDoZf4XXMjA2Ufjp5Tkzt51QufG5Lop8gdndyHR1vyZlaKO5+ ae1eUt8fTYGMpRS2H5JVoe6g47hKvmbUymliW5F6mK0ZMtHpUH+wT9kYuH3Dg69TssAe a8rjyD55ycXOXjzlWnbB2m4OW42ez209ZRPOZqEUvEPG5PMPuMy3T8+nza+SgfpbI/nY omVereu19TDJn6ty0R8KnAFhW1452DuWrvjrtKgKAzNwWTxJI3ZhTzP3rOmRk9Nk1spJ bcfg== X-Received: by 10.68.233.229 with SMTP id tz5mr8623611pbc.172.1363783455095; Wed, 20 Mar 2013 05:44:15 -0700 (PDT) Received: from luneth.maa.corp.collab.net ([182.71.239.158]) by mx.google.com with ESMTPS id y13sm2031559pbv.0.2013.03.20.05.44.11 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 20 Mar 2013 05:44:14 -0700 (PDT) X-Mailer: git-send-email 1.8.2 In-Reply-To: <1363783501-27981-1-git-send-email-artagnon@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This new configuration variable overrides `remote.pushdefault` and `branch..remote` for pushes. In a typical triangular-workflow setup, 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 --- Documentation/config.txt | 18 ++++++++++++++---- remote.c | 3 +++ t/t5516-fetch-push.sh | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index e813c33..4b9647a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -726,9 +726,18 @@ branch..remote:: When on branch , 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..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..pushremote:: + When on branch , it overrides `branch..remote` + when pushing. It also overrides `remote.pushdefault` when + pushing from branch . In a typical triangular-workflow + setup, 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..merge:: Defines, together with branch..remote, the upstream branch @@ -1899,7 +1908,8 @@ receive.updateserverinfo:: remote.pushdefault:: The remote to push to by default. Overrides - `branch..remote` for all branches. + `branch..remote` for all branches, and is overridden by + `branch..pushremote` for specific branches. remote..url:: The URL of a remote repository. See linkgit:git-fetch[1] or diff --git a/remote.c b/remote.c index 68056c7..c988168 100644 --- a/remote.c +++ b/remote.c @@ -366,6 +366,9 @@ static int handle_config(const char *key, const char *value, void *cb) default_remote_name = branch->remote_name; explicit_default_remote_name = 1; } + } else if (!strcmp(subkey, ".pushremote")) { + if (branch == current_branch) + git_config_string(&pushremote_name, key, value); } 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 63171f1..3f91874 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -539,6 +539,21 @@ test_expect_success 'push with config remote.*.pushurl' ' check_push_result $the_commit heads/master ' +test_expect_success 'push with config branch.*.pushremote' ' + mk_test_with_name up_repo heads/frotz && + mk_test_with_name side_repo heads/quux && + mk_test_with_name 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 && + test_must_fail check_push_result_with_name up_repo $the_commit heads/master && + test_must_fail check_push_result_with_name side_repo $the_commit heads/master && + check_push_result_with_name down_repo $the_commit heads/master +' + # clean up the cruft left with the previous one git config --remove-section remote.there -- 1.8.2