public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-media@vger.kernel.org, Hans Verkuil <hverkuil@xs4all.nl>
Subject: Re: [GIT PULL FOR v3.19] uvcvideo changes
Date: Mon, 24 Nov 2014 11:06:49 +0200	[thread overview]
Message-ID: <2578174.1LaTmadn8H@avalon> (raw)
In-Reply-To: <20141111085626.3f1201dc@recife.lan>

Hi Mauro,

On Tuesday 11 November 2014 08:56:26 Mauro Carvalho Chehab wrote:
> Em Fri, 07 Nov 2014 08:16:28 +0200 Laurent Pinchart escreveu:
> > Hi Mauro,
> > 
> > The following changes since commit 
4895cc47a072dcb32d3300d0a46a251a8c6db5f1:
> >   [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200)
> > 
> > are available in the git repository at:
> >   git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next
> 
> It seems that there's something weird with this URL... remotes????

git isn't playing nicely :-/

I've pushed the changes to the uvc/next branch on 
git://linuxtv.org/pinchartl/media.git, up to commit a1bee5f9f606. 
http://git.linuxtv.org/cgit.cgi/pinchartl/media.git/commit/?h=uvc/next 
confirms that everything is in order.

However, running

git request-pull local-linuxtv-master media remotes/media/uvc/next

with the media remote pointing to git://linuxtv.org/pinchartl/media.git 
generates

----------
warn: No match for commit a1bee5f9f606f89ff30171658a82bf532cca7f3d found at 
git://linuxtv.org/pinchartl/media.git
warn: Are you sure you pushed 'remotes/media/uvc/next' there?
The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1:

  [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200)

are available in the git repository at:

  git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next

for you to fetch changes up to a1bee5f9f606f89ff30171658a82bf532cca7f3d:

  uvcvideo: Return all buffers to vb2 at stream stop and start failure 
(2014-11-07 08:13:21 +0200)
----------

For some reason git can't find the remote branch (hence the warning) and thus 
generates the URL line incorrectly.

I've tried upgrading from git 2.0.4 to git 2.1.3 but the problem is still 
present. Creating a local branch named uvc/next fixes the problem. I wonder if 
I'm doing something really stupid or if it's a git bug.

Can you pull from

        git://linuxtv.org/pinchartl/media.git uvc/next

? I haven't updated the branch since I've sent the last pull request.

-- 
Regards,

Laurent Pinchart


  reply	other threads:[~2014-11-24  9:06 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-07  6:16 [GIT PULL FOR v3.19] uvcvideo changes Laurent Pinchart
2014-11-11 10:56 ` Mauro Carvalho Chehab
2014-11-24  9:06   ` Laurent Pinchart [this message]
2014-11-24 10:12     ` Mauro Carvalho Chehab
2014-11-24 10:41       ` Laurent Pinchart
2014-11-24 10:59         ` Mauro Carvalho Chehab
2014-11-24 11:14           ` Laurent Pinchart

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=2578174.1LaTmadn8H@avalon \
    --to=laurent.pinchart@ideasonboard.com \
    --cc=hverkuil@xs4all.nl \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@osg.samsung.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