From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@infradead•org>
Cc: Linus <torvalds@linux-foundation•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: unnecessary merges in the v4l-dvb tree
Date: Thu, 30 Oct 2014 21:59:39 +1100 [thread overview]
Message-ID: <20141030215939.5ab46078@canb.auug.org.au> (raw)
In-Reply-To: <20141030080934.154ff729@recife.lan>
[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]
Hi Mauro,
On Thu, 30 Oct 2014 08:09:34 -0200 Mauro Carvalho Chehab <mchehab@infradead•org> wrote:
>
> Em Thu, 30 Oct 2014 09:24:45 +1100
> Stephen Rothwell <sfr@canb•auug.org.au> escreveu:
>
> > The only ways I know around this is to either merge the commit
> > associated with the tag or do a (hard) reset to the tag.
>
> A hard reset to the tag would likely be a bad idea, as it would break
> the sub-maintainers trees that are based on my tree.
I should have said that I don't expect you to change your tree at the
moment, just for that reason. But maybe next time.
> I generally use "git pull" for that, as the man page says that the
> default behavior is to do fast forward:
> "--ff
> When the merge resolves as a fast-forward, only update
> the branch pointer, without creating a merge commit.
> This is the default behavior."
>
> It seems that the man page is then outdated for signed tags, or,
> eventually, we need to make --ff explicit on this case.
I think that --ff overrides this behaviour. Doing "git merge
'<tag>^{}'" works, but you can't use that with "git pull".
> I'll try the approach of merging the associated commit next time,
> but this is something that it is easy to forget.
I don't think it is a really big problem but it would be nicer for
everyone.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2014-10-30 10:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-29 22:24 linux-next: unnecessary merges in the v4l-dvb tree Stephen Rothwell
2014-10-30 10:09 ` Mauro Carvalho Chehab
2014-10-30 10:59 ` Stephen Rothwell [this message]
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=20141030215939.5ab46078@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@infradead$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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