From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: linux-next: unnecessary merge in the v4l-dvb tree
Date: Mon, 12 Feb 2018 22:21:57 -0200 [thread overview]
Message-ID: <20180212222157.0a3bd472@vento.lan> (raw)
In-Reply-To: <xmqqzi4drczv.fsf@gitster-ct.c.googlers.com>
Em Mon, 12 Feb 2018 15:42:44 -0800
Junio C Hamano <gitster@pobox.com> escreveu:
> Linus Torvalds <torvalds@linux-foundation.org> writes:
>
> > And some maintainers end up using multiple repositories as branches
> > (the old _original_ git model). Again, you can just use "git fetch +
> > git reset", of course, but that's a bit unsafe. In contrast, doing
> > "git pull --ff-only" is a safe convenient operation that does both the
> > fetch and the update to whatever state.
> >
> > But you do need that "--ff-only" to avoid the merge.
>
> OK. I guess it is legit (and semi-sensible) for downstream
> contributors to "git pull --ff-only $upstream $release_tag_X" to
> bring their long-running topic currently based on release X-1 up to
> date with respect to release X. It probably makes more sense than
> rebasing on top of release X, even though it makes a lot less sense
> than merging their topics into release X.
>
> As you said, pull of a tag that forbids fast-forward by default is
> rather old development (I am kind of surprised that it was so old,
> in v1.7.9), so it may be a bit difficult to transition.
>
> There is
>
> [pull]
> ff = only
>
> but pull.ff is quite global, and not good for intermediate level
> maintainers who pull to integrate work of their downstream (for
> which they do want the current "do not ff, record the tag in a merge
> commit" behaviour) and also pull to catch up from their upstream
> (which they want "ff-when-able"). They need to control between
> ff=only and ff=when-able, depending on whom they are pulling from.
Yes, that's my pain. I don't want ff only when pulling from others,
only when pulling from upstream tree.
>
> We may want per-remote equivalent for it, i.e. e.g.
>
> [pull]
> ff=false ;# good default for collecting contributions
>
> [remote "torvalds"]
> pullFF = only ;# good default for catching up
>
> or something like that, perhaps?
Yeah, something like that works. Please notice, however, that what I
usually do is:
$ git remote update torvalds
$ git merge <tag>
(or git pull . <tag>)
So, for the above to work, it should store somehow the remote from
where a tag came from.
The reason is that I keep locally a cache with several tree clones
(in bare mode) s that I bother enough to cache (linus, -stable, -next),
as pulling from BR is time consuming, and I want to do it only once
and use the same "cache" for all my git clones.
I have a few git workdirs for my upstream work, but, as a patch
developer, I also have "independent"[1] git repositories.
[1] Due to disk constraints, the clones actually use --shared. So,
the common objects are actually stored inside a single tree.
Thanks,
Mauro
next prev parent reply other threads:[~2018-02-13 0:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180213080036.3bf3a908@canb.auug.org.au>
2018-02-12 21:15 ` linux-next: unnecessary merge in the v4l-dvb tree Linus Torvalds
2018-02-12 21:36 ` Mauro Carvalho Chehab
2018-02-12 21:37 ` Linus Torvalds
2018-02-12 21:44 ` Junio C Hamano
2018-02-12 21:59 ` Linus Torvalds
2018-02-12 23:42 ` Junio C Hamano
2018-02-13 0:21 ` Mauro Carvalho Chehab [this message]
2018-02-13 17:18 ` Junio C Hamano
2018-02-13 17:33 ` Linus Torvalds
2018-02-14 18:12 ` Junio C Hamano
2018-02-15 22:45 ` [PATCH] merge: allow fast-forward when merging a tracked tag Junio C Hamano
2018-02-15 23:34 ` Eric Sunshine
2018-02-16 18:06 ` Junio C Hamano
2018-02-16 21:27 ` [PATCH v2] " Junio C Hamano
2018-02-12 21:37 ` linux-next: unnecessary merge in the v4l-dvb tree Junio C Hamano
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=20180212222157.0a3bd472@vento.lan \
--to=mchehab@osg.samsung.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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).