From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <stefanbeller@gmail.com>, Jeff King <peff@peff.net>,
Jonathan Tan <jonathantanmy@google.com>
Subject: Re: [PATCH v3 1/3] submodule: use "fetch" logic instead of custom remote discovery
Date: Mon, 16 Nov 2020 13:13:05 -0800 [thread overview]
Message-ID: <xmqqa6vh80pq.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201114122132.4344-2-avarab@gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Sat, 14 Nov 2020 13:21:30 +0100")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> Replace a use of the get_default_remote() function with an invocation
> of "git fetch"
>
> The "fetch" command already has logic to discover the remote for the
> current branch. However, before it learned to accept a custom
> refspec *and* use its idea of the default remote, it wasn't possible
> to get rid of some equivalent of the "get_default_remote" invocation
> here.
>
> As it turns out the recently added "--stdin" option to fetch[1] gives
> us a way to do that. Let's use it instead.
Ah, that was what your earlier question was about.
The hits from "git grep fetch_in_submodule" says that $1 is the path
to the submodule, $2 is the $depth and $3 (when exists) is the
object name of what we are fetching:
git-submodule.sh:578: fetch_in_submodule "$sm_path" $depth ||
git-submodule.sh:601: fetch_in_submodule "$sm_path" $depth ||
git-submodule.sh:607: fetch_in_submodule "$sm_path" $depth "$sha1" ||
> While I'm at it simplify the "fetch_in_submodule" function. It wasn't
> necessary to pass "$@" to "fetch" since we'd only ever provide one
> SHA-1 as an argument in the previous "*" codepath (in addition to
> "--depth=N"). Rewrite the function to more narrowly reflect its
> use-case.
> cd "$1" &&
> - case "$2" in
> - '')
> - git fetch ;;
> - *)
> - shift
> - git fetch $(get_default_remote) "$@" ;;
> - esac
So when $2 (i.e. --depth=N) is empty, we just did the default "git
fetch". Otherwise, "git fetch <remote> --depth=N [<sha1>]" was run.
> + if test $# -eq 3
> + then
> + echo "$3" | git fetch --stdin "$2"
This is not quite equivalent in that an empty depth would have
resulted in the default "git fetch" in the original code, with or
without "$3", totally ignoring "$sha1". Is this a bugfix snuck in
"while we are at it", or is this an unintended regression?
> + elif test "$2" -ne ""
> + then
> + git fetch "$2"
> + else
> + git fetch
> + fi
Even if it is an unintended regression, fixing it should be trivial;
we just need to flip the order of conditions, like so:
if test -z "$2"
then
git fetch
elif test $# = 3
then
echo "$3" | git fetch --stdin "$2"
else
git fetch "$2"
fi
next prev parent reply other threads:[~2020-11-16 21:14 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-11 13:47 [PATCH 00/11] Start retiring .git/remotes/ and .git/branches/ for good Johannes Schindelin
2017-05-11 13:47 ` [PATCH 01/11] git-parse-remote: fix highly misleading man page Johannes Schindelin
2017-05-11 17:21 ` Stefan Beller
2017-05-11 19:14 ` Johannes Schindelin
2020-11-11 15:17 ` [PATCH 0/5] Remove now-unused git-parse-remote Ævar Arnfjörð Bjarmason
2020-11-11 17:37 ` Jeff King
2020-11-11 19:29 ` Junio C Hamano
2020-11-12 14:09 ` Ævar Arnfjörð Bjarmason
2020-11-12 18:42 ` Jeff King
2020-11-12 14:19 ` How do I "git fetch" with a custom <refspec> but a default remote? Ævar Arnfjörð Bjarmason
2020-11-12 18:51 ` Jeff King
2020-11-12 19:26 ` Chris Torek
2020-11-12 20:48 ` Jeff King
2020-11-12 21:22 ` Junio C Hamano
2020-11-14 12:12 ` Ævar Arnfjörð Bjarmason
2020-11-11 15:17 ` [PATCH 1/5] parse-remote: remove unused GIT_DIR variable Ævar Arnfjörð Bjarmason
2020-11-11 15:17 ` [PATCH 2/5] parse-remote: remove long-dead rebase code Ævar Arnfjörð Bjarmason
2020-11-11 15:17 ` [PATCH 3/5] parse-remote: remove long-dead git-pull.sh code Ævar Arnfjörð Bjarmason
2020-11-11 15:17 ` [PATCH 4/5] parse-remote: move used code to git-submodule.sh Ævar Arnfjörð Bjarmason
2020-11-11 15:17 ` [PATCH 5/5] parse-remote: remove this now-unused library Ævar Arnfjörð Bjarmason
2020-11-11 16:33 ` Junio C Hamano
2020-11-12 20:31 ` [PATCH v2 0/2] Retire git-parse-remote Junio C Hamano
2020-11-12 20:31 ` [PATCH v2 1/2] parse-remote: move used code to git-submodule.sh Junio C Hamano
2020-11-12 20:31 ` [PATCH v2 2/2] parse-remote: remove this now-unused library Junio C Hamano
2020-11-12 20:49 ` [PATCH v2 0/2] Retire git-parse-remote Jeff King
2020-11-12 21:25 ` Junio C Hamano
2020-11-13 9:42 ` Ævar Arnfjörð Bjarmason
2020-11-14 12:21 ` [PATCH v3 0/3] submodule sh->C & retire parse-remote Ævar Arnfjörð Bjarmason
2020-11-14 12:21 ` [PATCH v3 1/3] submodule: use "fetch" logic instead of custom remote discovery Ævar Arnfjörð Bjarmason
2020-11-16 21:13 ` Junio C Hamano [this message]
2020-11-14 12:21 ` [PATCH v3 2/3] submodule: remove sh function in favor of helper Ævar Arnfjörð Bjarmason
2020-11-14 12:21 ` [PATCH v3 3/3] parse-remote: remove this now-unused library Ævar Arnfjörð Bjarmason
2020-11-16 21:19 ` Junio C Hamano
2020-11-17 14:24 ` Ævar Arnfjörð Bjarmason
2017-05-11 13:47 ` [PATCH 02/11] Documentation: really deprecate .git/remotes/ and .git/branches/ Johannes Schindelin
2017-05-11 13:47 ` [PATCH 03/11] remote: warn loud and clear when .git/branches/ is *still* used Johannes Schindelin
2017-05-11 13:47 ` [PATCH 04/11] remote: warn loud and clear when .git/remotes/ " Johannes Schindelin
2017-05-11 13:47 ` [PATCH 05/11] Revert "Revert "Don't create the $GIT_DIR/branches directory on init"" Johannes Schindelin
2017-05-11 17:26 ` Stefan Beller
2017-05-11 13:47 ` [PATCH 06/11] PREVIEW: t5510: convert .git/remotes/ test to use a regular remote Johannes Schindelin
2017-05-11 13:47 ` [PATCH 07/11] PREVIEW: t5516: stop testing .git/branches/ functionality Johannes Schindelin
2017-05-11 13:47 ` [PATCH 08/11] PREVIEW: remote: remove support for migrating ancient remotes Johannes Schindelin
2017-05-11 13:48 ` [PATCH 09/11] PREVIEW: t5515: remove .git/remotes/ and .git/branches/ tests Johannes Schindelin
2017-05-11 13:48 ` [PATCH 10/11] PREVIEW: t0060: stop testing support for .git/remotes/ and .git/branches/ Johannes Schindelin
2017-05-11 13:48 ` [PATCH 11/11] PREVIEW: remove " Johannes Schindelin
2017-05-11 18:19 ` Stefan Beller
2017-05-11 19:19 ` Johannes Schindelin
2017-05-12 1:14 ` [PATCH 00/11] Start retiring .git/remotes/ and .git/branches/ for good Junio C Hamano
2017-05-12 10:18 ` Johannes Schindelin
2017-05-16 0:37 ` Junio C Hamano
2017-05-16 8:05 ` Ævar Arnfjörð Bjarmason
2017-05-16 9:06 ` Junio C Hamano
2017-05-16 10:02 ` Ævar Arnfjörð Bjarmason
2017-05-17 0:51 ` Junio C Hamano
2017-05-12 12:00 ` Junio C Hamano
2017-05-12 14:19 ` Johannes Schindelin
2017-05-12 17:38 ` Jonathan Nieder
2017-05-13 10:13 ` Junio C Hamano
2017-05-12 21:11 ` Junio C Hamano
2017-05-15 8:42 ` Johannes Schindelin
2017-05-12 9:11 ` Jeff King
2017-05-12 11:09 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa6vh80pq.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
--cc=stefanbeller@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).