public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@infradead.org>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Kyungmin Park <kmpark@infradead.org>,
	linux-media@vger.kernel.org, kernel@pengutronix.de,
	Pawel Osciak <pawel@osciak.com>,
	Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
	Hans Verkuil <hverkuil@xs4all.nl>,
	Marek Szyprowski <m.szyprowski@samsung.com>
Subject: Re: [PATCH] [media] V4L/videobuf2-memops: use pr_debug for debug messages
Date: Fri, 03 Jun 2011 12:39:52 -0300	[thread overview]
Message-ID: <4DE90048.2060407@infradead.org> (raw)
In-Reply-To: <20110603073908.GC9907@pengutronix.de>

Em 03-06-2011 04:39, Uwe Kleine-König escreveu:
> Hello Mauro,
> 
> On Wed, Jun 01, 2011 at 10:34:31PM -0300, Mauro Carvalho Chehab wrote:
>> Hi Kyungmin,
>>
>> Em 01-06-2011 21:50, Kyungmin Park escreveu:
>>> Acked-by: Kyungmin Park <kyunginn.,park@samsung.com>
>>
>> As this patch is really trivial and makes sense, I've just applied it earlier
>> today.
> You somehow screwed up my name in the Author field more than I'm used
> to:
> 
>  $ git cat-file commit 215c52702775556f4caf5872cc84fa8810e6fc7d | grep Uwe
>  author Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 1306959562 -0300
>  Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Strange enough my name in the commitlog looks fine.

You should thank Python for that. We use patchwork to retrieve patches. It is written
in Python. Python seems to have serious troubles handling anything that it is not pure
ASCII. In the past, a non-north-american name in Patchwork would be simply discarded,
as python used to abort patchwork. Lots of locale-fix patches later trying to address
this issue and now, it sometimes do the right thing.

> 
> If you care to fix it, you can easily do so using git filter-branch.
> E.g.:
> 
> 	$ git filter-branch --env-filter 'test "x$GIT_COMMIT" != "x215c52702775556f4caf5872cc84fa8810e6fc7d" || { GIT_AUTHOR_NAME="Uwe Kleine-König"; export GIT_AUTHOR_NAME; }' ^215c5270277^ HEAD
> 
> (Assuming an UTF-8 locale.)
> 
> This converts 215c527 to a commit c6cbbfc that has my name fixed and
> rebases all following commits on top of this. In your master branch this
> only affects "00c4526 (Merge /home/v4l/v4l/for_upstream)"

This breaks merge. 

$ git push
To /home/v4l/bare_trees/v4l-dvb.git/
 ! [rejected]        staging/for_v3.0 -> staging/for_v3.0 (non-fast-forward)


Fortunately, as the patches on this branch are meant to go to v3.1,
I just renamed the branch to staging/for_v3.1, keeping the wrong patch
at the old branch. This way, the need of rebasing was avoided.

> 
> Best regards and thanks
> Uwe
> 


  reply	other threads:[~2011-06-03 15:40 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-01 20:19 [PATCH] [media] V4L/videobuf2-memops: use pr_debug for debug messages Uwe Kleine-König
2011-06-02  0:50 ` Kyungmin Park
2011-06-02  1:34   ` Mauro Carvalho Chehab
2011-06-02  5:56     ` Marek Szyprowski
2011-06-02 11:06       ` Mauro Carvalho Chehab
2011-06-03  7:39     ` Uwe Kleine-König
2011-06-03 15:39       ` Mauro Carvalho Chehab [this message]
2011-06-03 19:50         ` Uwe Kleine-König
2011-06-03 19:56           ` Mauro Carvalho Chehab

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=4DE90048.2060407@infradead.org \
    --to=mchehab@infradead.org \
    --cc=g.liakhovetski@gmx.de \
    --cc=hverkuil@xs4all.nl \
    --cc=kernel@pengutronix.de \
    --cc=kmpark@infradead.org \
    --cc=linux-media@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=pawel@osciak.com \
    --cc=u.kleine-koenig@pengutronix.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