From: Paul Campbell <pcampbell@kemitix.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>, David Greene <greened@obbligato.org>,
bibendi <bibendi@bk.ru>, Avery Pennarun <apenwarr@gmail.com>,
Wayne Walter <wayne@tickzoom.com>
Subject: Re: [PATCH v2 04/23] contrib/subtree: Teach push and pull to use .gittrees for defaults
Date: Sun, 24 Mar 2013 21:22:30 +0000 [thread overview]
Message-ID: <CALeLG_=pV1Y0Qabw9C=3PACWUWPw2=ajacFG++djBxaO4S6z7g@mail.gmail.com> (raw)
In-Reply-To: <7vobeqbobz.fsf@alter.siamese.dyndns.org>
On Mon, Mar 11, 2013 at 3:35 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> From: bibendi <bibendi@bk.ru>
>>
>> Look in the config file .gittrees for a default repository and
>> refspec or commit when they are not provided on the command line.
>>
>> Uses the .gittrees config file in a similar way to how git-submodule
>> uses the .gitmodules file.
>
> What the patch does can be read from the code, but what benefit
> would users get by the extra file?
How about:
"Usually push and pull are to the same repository/branch that they were
originally added from. Add stores the repository/branch in .gittrees
which push and pull can now default to if not provided on the command
line."
>> cmd_pull()
>> {
>> - ensure_clean
>> - git fetch "$@" || exit $?
>> - revs=FETCH_HEAD
>> - set -- $revs
>> - cmd_merge "$@"
>> + if [ $# -ne 1 ]; then
>
> Broken indentation?
>
>> + die "You must provide <branch>"
>> + fi
>
> It used to allow "git fetch $there" and let the configured
> remote.$there.fetch refspec to decide what gets fetched, and also it
> used to allow "git fetch $there $that_branch" to explicitly fetch
> the named branch. But this change insists that the user has to give
> what gets fetched from the command line and forbids the user from
> giving where to fetch from, it seems. Isn't it a regression? Why
> is it a good idea to forbid such uses that the script used to
> accept?
>
> The proposed log message does not explain why it is not a
> regression, or why accepting some use patterns that the script used
> to allow was a bug that needs to be diagnosed with this new
> conditional.
I think the patch was based on an older version of git-subtree before
"git fetch $there" support was added. Will need to update it.
>> + if [ -e "$dir" ]; then
>> + ensure_clean
>> + repository=$(git config -f .gittrees subtree.$prefix.url)
>> + refspec=$1
>> + git fetch $repository $refspec || exit $?
>> + echo "git fetch using: " $repository $refspec
>
> Why are these variable references outside the dq pair?
>
They're inside now.
Rerolling once I figure out the update for "git fetch $there" support.
--
Paul [W] Campbell
next prev parent reply other threads:[~2013-03-24 21:23 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-10 23:41 [PATCH v2 00/23] contrib/subtree: Collected updates Paul Campbell
2013-03-10 23:41 ` [PATCH v2 01/23] contrib/subtree: Fix typo (s/incldued/included/) Paul Campbell
2013-03-10 23:41 ` [PATCH v2 02/23] contrib/subtree: Add command from-submodule Paul Campbell
2013-03-11 3:19 ` Junio C Hamano
2013-03-24 20:59 ` [PATCH] " Paul Campbell
2013-03-10 23:41 ` [PATCH v2 03/23] contrib/subtree: Teach add to store repository & branch in .gittrees Paul Campbell
2013-03-11 3:24 ` Junio C Hamano
2013-03-24 20:17 ` Paul Campbell
2013-03-24 20:22 ` [PATCH] " Paul Campbell
2013-03-10 23:41 ` [PATCH v2 04/23] contrib/subtree: Teach push and pull to use .gittrees for defaults Paul Campbell
2013-03-11 3:35 ` Junio C Hamano
2013-03-24 21:22 ` Paul Campbell [this message]
2013-03-10 23:41 ` [PATCH v2 05/23] contrib/subtree: Add commands pull_all and push_all Paul Campbell
2013-03-11 5:03 ` Junio C Hamano
2013-03-11 11:49 ` Paul Campbell
2013-03-10 23:41 ` [PATCH v2 06/23] contrib/subtree: Rename commands push_all/pull_all to push-all/pull-all Paul Campbell
2013-03-10 23:41 ` [PATCH v2 07/23] contrib/subtree: Teach push and pull to use .gittrees if needed Paul Campbell
2013-03-10 23:41 ` [PATCH v2 08/23] contrib/subtree: Replace invisible carriage return with a visible \r Paul Campbell
2013-03-10 23:41 ` [PATCH v2 09/23] contrib/subtree: Teach push to abort if split fails Paul Campbell
2013-03-10 23:41 ` [PATCH v2 10/23] contrib/subtree: Add command diff Paul Campbell
2013-03-10 23:41 ` [PATCH v2 11/23] contrib/subtree: Add command list Paul Campbell
2013-03-10 23:41 ` [PATCH v2 12/23] contrib/subtree: Add command prune Paul Campbell
2013-03-10 23:41 ` [PATCH v2 13/23] contrib/subtree: Add prune command to OPTS_SPEC Paul Campbell
2013-03-10 23:41 ` [PATCH v2 14/23] contrib/subtree: Remove trailing slash from prefix parameter Paul Campbell
2013-03-10 23:41 ` [PATCH v2 15/23] contrib/subtree: Teach from-submodule to add new subtree to .gittrees Paul Campbell
2013-03-10 23:41 ` [PATCH v2 16/23] contrib/subtree: Document pull-all and push-all Paul Campbell
2013-03-10 23:41 ` [PATCH v2 17/23] contrib/subtree: Document from-submodule and prune commands Paul Campbell
2013-03-10 23:41 ` [PATCH v2 18/23] contrib/subtree: Add missing commands to SYNOPSIS Paul Campbell
2013-03-10 23:41 ` [PATCH v2 19/23] contrib/subtree: Document list command Paul Campbell
2013-03-10 23:41 ` [PATCH v2 20/23] contrib/subtree: Teach push to use --force option Paul Campbell
2013-03-10 23:41 ` [PATCH v2 21/23] contrib/subtree: Convert spaces to tabs and remove some trailing whitespace Paul Campbell
2013-03-10 23:41 ` [PATCH v2 22/23] contrib/subtree: Parameters repository/branch for push/pull are optional Paul Campbell
2013-03-10 23:41 ` [PATCH v2 23/23] contrib/subtree: Fix order of case switches so default case is last Paul Campbell
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALeLG_=pV1Y0Qabw9C=3PACWUWPw2=ajacFG++djBxaO4S6z7g@mail.gmail.com' \
--to=pcampbell@kemitix.net \
--cc=apenwarr@gmail.com \
--cc=bibendi@bk.ru \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=greened@obbligato.org \
--cc=wayne@tickzoom.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.
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 NNTP newsgroup(s).