From patchwork Wed Aug 14 13:46:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Moy X-Patchwork-Id: 11094049 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15C976C5 for ; Wed, 14 Aug 2019 14:06:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00043285EA for ; Wed, 14 Aug 2019 14:06:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7C0728862; Wed, 14 Aug 2019 14:06:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AE16285EA for ; Wed, 14 Aug 2019 14:06:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728104AbfHNOGj (ORCPT ); Wed, 14 Aug 2019 10:06:39 -0400 Received: from mut-mta1-se01b-zose1-fr.yulpa.io ([185.49.22.247]:33057 "EHLO mut-mta1-se01b-zose1-fr.yulpa.io" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726865AbfHNOGi (ORCPT ); Wed, 14 Aug 2019 10:06:38 -0400 X-Greylist: delayed 1163 seconds by postgrey-1.27 at vger.kernel.org; Wed, 14 Aug 2019 10:06:36 EDT Received: from mut-zose1-mta-hub-out01-fr.yulpa.io ([185.49.20.54] helo=mut-zose1-mta-hub-outmua01b-fr.yulpa.io) by mut-mta1-se01b-fr.yulpa.io with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1hxtcD-000HxR-CU; Wed, 14 Aug 2019 15:47:10 +0200 Received: from localhost (localhost [127.0.0.1]) by mut-zose1-mta-hub-outmua01b-fr.yulpa.io (Postfix) with ESMTP id 133F510209E; Wed, 14 Aug 2019 15:47:00 +0200 (CEST) Received: from mut-zose1-mta-hub-outmua01b-fr.yulpa.io ([127.0.0.1]) by localhost (mut-zose1-mta-hub-outmua01b-fr.yulpa.io [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 60Nw_XwXYuyn; Wed, 14 Aug 2019 15:46:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mut-zose1-mta-hub-outmua01b-fr.yulpa.io (Postfix) with ESMTP id 09D641020A2; Wed, 14 Aug 2019 15:46:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at mut-zose1.yulpa.io Received: from mut-zose1-mta-hub-outmua01b-fr.yulpa.io ([127.0.0.1]) by localhost (mut-zose1-mta-hub-outmua01b-fr.yulpa.io [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id q11ARwGLGfDI; Wed, 14 Aug 2019 15:46:58 +0200 (CEST) Received: from moylip.lip.ens-lyon.fr (dhcp-13-233.lip.ens-lyon.fr [140.77.13.233]) (Authenticated sender: matthieu.moy@matthieu-moy.fr) by mut-zose1-mta-hub-outmua01b-fr.yulpa.io (Postfix) with ESMTPSA id BFD5B10209E; Wed, 14 Aug 2019 15:46:58 +0200 (CEST) From: Matthieu Moy To: git@vger.kernel.org, matthieu.moy@univ-lyon1.fr Cc: corentin.bompard@etu.univ-lyon1.fr, gitster@pobox.com, nathan.berbezier@etu.univ-lyon1.fr, pablo.chabanne@etu.univ-lyon1.fr, Matthieu Moy Subject: [PATCH] pull, fetch: add --set-upstream option Date: Wed, 14 Aug 2019 15:46:29 +0200 Message-Id: <20190814134629.21096-1-git@matthieu-moy.fr> X-Mailer: git-send-email 2.20.1.98.gecbdaf0 In-Reply-To: <86zhoil3yw.fsf@univ-lyon1.fr> References: <86zhoil3yw.fsf@univ-lyon1.fr> MIME-Version: 1.0 X-Originating-IP: 185.49.20.54 X-yulPa-Domain: mut-zose1.yulpa.io X-yulPa-Username: 185.49.20.54 Authentication-Results: yulpa.io; auth=pass smtp.auth=185.49.20.54@mut-zose1.yulpa.io X-yulPa-Outgoing-Class: ham X-yulPa-Outgoing-Evidence: Combined (0.03) X-Recommended-Action: accept X-Filter-ID: Mvzo4OR0dZXEDF/gcnlw0YiRRkpbHZ8F3zevhEShTfypSDasLI4SayDByyq9LIhVskKGEDIgHR3h xP1DzksMdUTNWdUk1Ol2OGx3IfrIJKyP9eGNFz9TW9u+Jt8z2T3K/ul8EzZFK7PjxbL6TZ5y/ABn Bx2qQbdL1/YP7F9FT18R74xqT0ZUtArmRSbxpjsFVbNiDoRVAi1uIJx5hODtLHI7vtBXWEq8QtPk gbiwp8pIJb9212px10C3TdL9EtOWlm0qUmsuKi3RJj9knUTJti3CueNfqMJBYzPoh8qXShBU6C1I zYUzQVV3UCXOcMrgj0EZBWlS7yxT2d6NX4GqC9q9Uvxs027xYD32j0KG+ezAnai31M7dF8usmm8O 3+jwr2tZ699xXLsZngP2qXvj1uKVse1sVhWabI0/+PN3sIJkYWvWNZaZ0U+2WAj4Iohtz9+0obOQ /4Au5swlnGadp6CRlU8C1WnyUnLVFToIQvrIrxLCZp9Sd4tds0J6Y5wJwEr229KB/6clHODM7k6D iKYNZ1uK2CRFUd80lC+BinR7adGiiPHrMlYIVkH60xZhKEyo7eGOk4CYU1DDb9mhHHyNorheeibm 3WriJmfuZ98L+ZOSbzjImTn25GTijHwfVObthVmcSa2zH/eZl+9MwJT7qmWzK4Bx1WIeFtGbNIt7 vMDcwLqLGB+xDtP7BtE8Hz0bzpJl/jutim/hvpmAa6SoOE974E0u5C4r82NtIfvEaZWzla67okw5 +LTnA9hhPBHH57cLkN8Bd0wm8jqRC7iK9ree+gUyHwXcNW6nr8Boh9VoIekQHpwUfpYnEThmEGxS Fp15maAKnluaxCcVQS6OEx1CThXglRZxaMInFD8Ha75EisdYjOMhqKG3F3DDxOtvpADbLjUx/vmK /Pr5BbCophMACiHsRlf8t4qYyg2yFAyQLbDKYkHQign4W6SCvRKnzt0jxNZYu4WrfbbZmjFtbEyn 2P4u4n4ZEouAXty96lTl15RD5tA1v8q+kirKCHQC9gWc/ZNdDYukLAlaS1e8hBdgHPFOkNt6qfss cGTMTC+0l1afwktr10M2BZ01y7etE50//vdIE+/r79PaJyPbaAeFrOWFYLyGyjW8koxgJYzB1qHm ab5b47wBJGXTmx3sX1QMTGj9cMllOHwI+G+1+ao5IFxjNz+fNkr2BedL0iD8CBN6Nyboe0elXlPy 26NJ4nFxT6fDKMo/x2MtXquDnONeMVij5A2eZiW1A6cHoD+Lq/Kh4BKeITbvYbQd9KHbyJYnqURN xchfgcTIikVcTYiIgVJZ+JgMHCV2GtAxL7hrJSk60SF3F6RYOYr2 X-Report-Abuse-To: spam@mut-mta1-se01a-fr.yulpa.io Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Corentin BOMPARD Add the --set-upstream option to git pull/fetch which lets the user set the upstream configuration (branch..merge and branch..remote) for the current branch. A typical use-case is: git clone http://example.com/my-public-fork git remote add main http://example.com/project-main-repo git pull --set-upstream main master or, instead of the last line: git fetch --set-upstream main master git merge # or git rebase This functionality is analog to push --set-upstream. Signed-off-by: Corentin BOMPARD Signed-off-by: Nathan BERBEZIER Signed-off-by: Pablo CHABANNE Signed-off-by: Matthieu Moy Patch-edited-by: Matthieu Moy --- This is a followup on https://public-inbox.org/git/86zhoil3yw.fsf@univ-lyon1.fr/. It's initially a student project, but students didn't get time to complete it. Still, I think the feature is interesting, and I finally get time to fix the remarks made up to now. This now looks good to me, but obviously needs other pairs of eyes. Thanks, Documentation/fetch-options.txt | 7 ++ builtin/fetch.c | 48 ++++++++- builtin/pull.c | 6 ++ t/t5553-set-upstream.sh | 178 ++++++++++++++++++++++++++++++++ 4 files changed, 238 insertions(+), 1 deletion(-) create mode 100755 t/t5553-set-upstream.sh diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 3c9b4f9e09..99df1f3d4e 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -169,6 +169,13 @@ ifndef::git-pull[] Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option). +--set-upstream:: + If the remote is fetched successfully, pull and add upstream + (tracking) reference, used by argument-less + linkgit:git-pull[1] and other commands. For more information, + see `branch..merge` and `branch..remote` in + linkgit:git-config[1]. + --submodule-prefix=:: Prepend to paths printed in informative messages such as "Fetching submodule foo". This option is used diff --git a/builtin/fetch.c b/builtin/fetch.c index 717dd14e89..5557ae1c04 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -23,6 +23,7 @@ #include "packfile.h" #include "list-objects-filter-options.h" #include "commit-reach.h" +#include "branch.h" #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000) @@ -50,7 +51,7 @@ static int fetch_prune_tags_config = -1; /* unspecified */ static int prune_tags = -1; /* unspecified */ #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */ -static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative; +static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative, set_upstream; static int progress = -1; static int enable_auto_gc = 1; static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen; @@ -123,6 +124,8 @@ static struct option builtin_fetch_options[] = { OPT__VERBOSITY(&verbosity), OPT_BOOL(0, "all", &all, N_("fetch from all remotes")), + OPT_BOOL(0, "set-upstream", &set_upstream, + N_("set upstream for git pull/fetch")), OPT_BOOL('a', "append", &append, N_("append to .git/FETCH_HEAD instead of overwriting")), OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), @@ -1367,6 +1370,49 @@ static int do_fetch(struct transport *transport, retcode = 1; goto cleanup; } + + if (set_upstream) { + struct branch *branch = branch_get("HEAD"); + struct ref *rm; + struct ref *source_ref = NULL; + + /* + * We're setting the upstream configuration for the current branch. The + * relevent upstream is the fetched branch that is meant to be merged with + * the current one, i.e. the one fetched to FETCH_HEAD. + * + * When there are several such branches, consider the request ambiguous and + * err on the safe side by doing nothing and just emit a warning. + */ + for (rm = ref_map; rm; rm = rm->next) { + if (!rm->peer_ref) { + if (source_ref) { + warning(_("multiple branch detected, incompatible with --set-upstream")); + goto skip; + } else { + source_ref = rm; + } + } + } + if (source_ref) { + if (!strcmp(source_ref->name, "HEAD") || + starts_with(source_ref->name, "refs/heads/")) { + install_branch_config(0, branch->name, + transport->remote->name, + source_ref->name); + } else if (starts_with(source_ref->name, "refs/remotes/")) { + warning(_("not setting upstream for a remote remote-tracking branch")); + } else if (starts_with(source_ref->name, "refs/tags/")) { + warning(_("not setting upstream for a remote tag")); + } else { + warning(_("unknown branch type")); + } + } else { + warning(_("no source branch found.\n" + "you need to specify exactly one branch with the --set-upstream option.")); + } + } + skip: free_refs(ref_map); /* if neither --no-tags nor --tags was specified, do automated tag diff --git a/builtin/pull.c b/builtin/pull.c index f1eaf6e6ed..d25ff13a60 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -129,6 +129,7 @@ static char *opt_refmap; static char *opt_ipv4; static char *opt_ipv6; static int opt_show_forced_updates = -1; +static char *set_upstream; static struct option pull_options[] = { /* Shared options */ @@ -243,6 +244,9 @@ static struct option pull_options[] = { PARSE_OPT_NOARG), OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates, N_("check for forced-updates on all updated branches")), + OPT_PASSTHRU(0, "set-upstream", &set_upstream, NULL, + N_("set upstream for git pull/fetch"), + PARSE_OPT_NOARG), OPT_END() }; @@ -556,6 +560,8 @@ static int run_fetch(const char *repo, const char **refspecs) argv_array_push(&args, "--show-forced-updates"); else if (opt_show_forced_updates == 0) argv_array_push(&args, "--no-show-forced-updates"); + if (set_upstream) + argv_array_push(&args, set_upstream); if (repo) { argv_array_push(&args, repo); diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh new file mode 100755 index 0000000000..bd1a94f494 --- /dev/null +++ b/t/t5553-set-upstream.sh @@ -0,0 +1,178 @@ +#!/bin/sh + +test_description='"git fetch/pull --set-upstream" basic tests.' +. ./test-lib.sh + +check_config () { + printf "%s\n" "$2" "$3" >"expect.$1" && + { + git config "branch.$1.remote" && git config "branch.$1.merge" + } >"actual.$1" && + test_cmp "expect.$1" "actual.$1" +} + +check_config_missing () { + test_expect_code 1 git config "branch.$1.remote" && + test_expect_code 1 git config "branch.$1.merge" +} + +clear_config () { + for branch in "$@"; do + test_might_fail git config --unset-all "branch.$branch.remote" + test_might_fail git config --unset-all "branch.$branch.merge" + done +} + +ensure_fresh_upstream () { + rm -rf parent && git init --bare parent +} + +test_expect_success 'setup bare parent fetch' ' + ensure_fresh_upstream && + git remote add upstream parent +' + +test_expect_success 'setup commit on master and other fetch' ' + test_commit one && + git push upstream master && + git checkout -b other && + test_commit two && + git push upstream other +' + +#tests for fetch --set-upstream + +test_expect_success 'fetch --set-upstream does not set upstream w/o branch' ' + clear_config master other && + git checkout master && + git fetch --set-upstream upstream && + check_config_missing master && + check_config_missing other +' + +test_expect_success 'fetch --set-upstream upstream master sets branch master but not other' ' + clear_config master other && + git fetch --set-upstream upstream master && + check_config master upstream refs/heads/master && + check_config_missing other +' + +test_expect_success 'fetch --set-upstream upstream other sets branch other' ' + clear_config master other && + git fetch --set-upstream upstream other && + check_config master upstream refs/heads/other && + check_config_missing other +' + +test_expect_success 'fetch --set-upstream master:other does not set the branch other2' ' + clear_config other2 && + git fetch --set-upstream upstream master:other2 && + check_config_missing other2 +' + +test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com fails with invalid url' ' + # master explicitly not cleared, we check that it is not touched from previous value + clear_config other other2 && + test_must_fail git fetch --set-upstream http://nosuchdomain.example.com && + check_config master upstream refs/heads/other && + check_config_missing other && + check_config_missing other2 +' + +test_expect_success 'fetch --set-upstream with valid URL sets upstream to URL' ' + clear_config other other2 && + url="file://'"$PWD"'" && + git fetch --set-upstream "$url" && + check_config master "$url" HEAD && + check_config_missing other && + check_config_missing other2 +' + +#tests for pull --set-upstream + +test_expect_success 'setup bare parent pull' ' + git remote rm upstream && + ensure_fresh_upstream && + git remote add upstream parent +' + +test_expect_success 'setup commit on master and other pull' ' + test_commit three && + git push --tags upstream master && + test_commit four && + git push upstream other +' + +test_expect_success 'pull --set-upstream upstream master sets branch master but not other' ' + clear_config master other && + git pull --set-upstream upstream master && + check_config master upstream refs/heads/master && + check_config_missing other +' + +test_expect_success 'pull --set-upstream master:other2 does not set the branch other2' ' + clear_config other2 && + git pull --set-upstream upstream master:other2 && + check_config_missing other2 +' + +test_expect_success 'pull --set-upstream upstream other sets branch master' ' + clear_config master other && + git pull --set-upstream upstream other && + check_config master upstream refs/heads/other && + check_config_missing other +' + +test_expect_success 'pull --set-upstream upstream tag does not set the tag' ' + clear_config three && + git pull --tags --set-upstream upstream three && + check_config_missing three +' + +test_expect_success 'pull --set-upstream http://nosuchdomain.example.com fails with invalid url' ' + # master explicitly not cleared, we check that it is not touched from previous value + clear_config other other2 three && + test_must_fail git pull --set-upstream http://nosuchdomain.example.com && + check_config master upstream refs/heads/other && + check_config_missing other && + check_config_missing other2 && + check_config_missing three +' + +test_expect_success 'pull --set-upstream upstream HEAD sets branch HEAD' ' + clear_config master other && + git pull --set-upstream upstream HEAD && + check_config master upstream HEAD && + git checkout other && + git pull --set-upstream upstream HEAD && + check_config other upstream HEAD +' + +test_expect_success 'pull --set-upstream upstream with more than one branch does nothing' ' + clear_config master three && + git pull --set-upstream upstream master three && + check_config_missing master && + check_config_missing three +' + +test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' ' + clear_config master other other2 && + git checkout master && + url="file://'"$PWD"'" && + git pull --set-upstream "$url" && + check_config master "$url" HEAD && + check_config_missing other && + check_config_missing other2 +' + +test_expect_success 'pull --set-upstream with valid URL and branch sets branch' ' + clear_config master other other2 && + git checkout master && + url="file://'"$PWD"'" && + git pull --set-upstream "$url" master && + check_config master "$url" refs/heads/master && + check_config_missing other && + check_config_missing other2 +' + +test_done