From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org, Liam Girdwood <lrg@ti.com>
Subject: Re: ASoC updates for 3.4
Date: Thu, 26 Jan 2012 15:57:39 +0000 [thread overview]
Message-ID: <20120126155739.GA19703@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <s5hmx9av59g.wl%tiwai@suse.de>
[-- Attachment #1.1: Type: text/plain, Size: 1366 bytes --]
On Thu, Jan 26, 2012 at 04:43:23PM +0100, Takashi Iwai wrote:
> Mark Brown wrote:
> > That's the tagging - older (and by older I mean "currently released")
> > versions of git can only pull from branches so that's just saying it
> > can't find the tag object.
> It seems that the problem is rather in the server side.
> I updated the git to version 1.7.9.rc2, but it still gives the same
> error at pull. Meanwhile, I could pull a signed tag from a local
> tree. Or I'm overlooking something obvious.
I've deleted the tag since. If you try pulling from
git://git.kernel.org/pub/scm/kernel/git/broonie/regmap.git topic/patch
it should DTRT (I hope).
> BTW, the pull of a signed tag gives always a merge commit even if it
> can be fast-forwarded. The --ff option doesn't work, too.
> This is the intended behavior, AFAIK.
> OTOH, we don't want to see too many merge commits in a straight
> development line while the development phase. So, pulling signed tags
> from you while development might be not always ideal, if we want to
> keep the sound git trees better in sync.
I'm not sure it's much of an issue, but I guess it's not a big deal.
I'd prefer to use the signed tags for the fixes if that's OK, but I'll
omit them for development branches. Or hold back on pushing to you so
often or something (we're integration testing via -next after all).
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
next prev parent reply other threads:[~2012-01-26 15:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-24 20:11 ASoC updates for 3.4 Mark Brown
2012-01-24 20:33 ` Takashi Iwai
2012-01-24 20:46 ` Mark Brown
2012-01-25 9:14 ` Takashi Iwai
2012-01-25 11:35 ` Mark Brown
2012-01-26 15:43 ` Takashi Iwai
2012-01-26 15:57 ` Mark Brown [this message]
2012-01-26 16:10 ` Takashi Iwai
2012-01-26 16:40 ` Mark Brown
2012-01-26 16:46 ` Takashi Iwai
[not found] <20120304153255.GB4978@opensource.wolfsonmicro.com>
2012-03-05 12:21 ` Mark Brown
2012-03-05 14:17 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2012-03-06 13:02 Mark Brown
2012-03-06 13:47 ` Takashi Iwai
2012-03-14 14:07 Mark Brown
2012-03-15 6:39 ` Takashi Iwai
2012-03-29 12:08 Mark Brown
2012-03-29 16:02 ` Takashi Iwai
2012-03-29 16:35 ` Mark Brown
2012-04-07 10:21 Mark Brown
2012-04-07 10:31 ` Takashi Iwai
2012-04-23 16:28 Mark Brown
2012-04-23 16:41 ` Takashi Iwai
2012-05-02 9:30 Mark Brown
2012-05-05 9:38 ` Takashi Iwai
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=20120126155739.GA19703@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=lrg@ti.com \
--cc=tiwai@suse.de \
/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).