git quiltimport and git apply fail importing the PREEMPT_RT patches

["Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>]

Hello,

	~/gsrc/linux-2.6$ git version
	git version 1.5.6.5

(but with newer git I get the same)

	~/gsrc/linux-2.6$ git checkout v2.6.29-rc8
	Note: moving to "v2.6.29-rc8" which isn't a local branch
	If you want to create a new branch from this checkout, you may do so
	(now or later) by using -b with the checkout command again. Example:
	  git checkout -b <new_branch_name>

	~/gsrc/linux-2.6$ wget -O - http://www.kernel.org/pub/linux/kernel/projects/rt/patch-2.6.29-rc8-rt2-broken-out.tar.bz2 | tar xjf -

	~/gsrc/linux-2.6$ git quiltimport --author="do <nt@kn.ow>"
	origin.patch.bz2
	Patch is empty.  Was it split wrong?

hhmmm, quilt seems to support packed patches.

After bunzip2 origin.patch.bz2 and editing series accordingly I get:

	~/gsrc/linux-2.6$ git quiltimport --author="do <nt@kn.ow>"
	origin.patch
	.dotest/patch:12188: space before tab in indent.
			.platform_data  = &markeins_flash_data,
	.dotest/patch:19521: trailing whitespace.
		
	.dotest/patch:20778: trailing whitespace.
		[PERF_COUNT_BRANCH_INSTRUCTIONS] = 0x230e4,	/* BR_ISSUED */ 
	.dotest/patch:21259: trailing whitespace.
		[PERF_COUNT_BRANCH_INSTRUCTIONS] = 0x230e4,	/* BR_ISSUED */ 
	.dotest/patch:21548: trailing whitespace.
		[PERF_COUNT_BRANCH_INSTRUCTIONS] = 0x410a0,	/* BR_PRED */ 
	error: cannot apply binary patch to 'Documentation/logo.gif' without full index line
	error: Documentation/logo.gif: patch does not apply

The hunk for Documentation/logo.gif looks as follows:

	diff --git a/Documentation/logo.gif b/Documentation/logo.gif
	deleted file mode 100644
	index 2eae75f..0000000
	Binary files a/Documentation/logo.gif and /dev/null differ

For me this looks complete enough to be applicable:

	~/gsrc/linux-2.6$ git ls-tree HEAD:Documentation | grep logo.gif
	100644 blob 2eae75fecfb965f49065c680063a40c594736ee5	logo.gif

(For these who want to look into the 2nd issue, here is an easier
reproduction recipe:

	~/gsrc/linux-2.6$ git apply --index -C1 - << EOF
	> diff --git a/Documentation/logo.gif b/Documentation/logo.gif
	> deleted file mode 100644
	> index 2eae75f..0000000
	> Binary files a/Documentation/logo.gif and /dev/null differ
	> EOF
	error: cannot apply binary patch to 'Documentation/logo.gif' without full index line
	error: Documentation/logo.gif: patch does not apply

)

For the first issue I have a patch that I'll send as a reply to this
mail.  Luckily this works around the second problem, too :-)

Best regards
Uwe

-- 
Pengutronix e.K.                              | Uwe Kleine-König            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |