git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: git@vger.kernel.org
Subject: fetch and bundle don't work in (semi-)broken repo
Date: Tue, 19 Oct 2010 18:09:57 +0200	[thread overview]
Message-ID: <20101019160957.GK11713@pengutronix.de> (raw)

Hi,

I have a repo that got broken somehow (don't know the exact details,
probably because it is shared with another repo and I rewrote history).
Now I want to fetch one branch to a different repo (that happens to be
the alternative to the first one, but I think this is unrelated.):

	ukl@hostname:~/path1/linux-2.6$ git fetch ~/path2/linux-2.6 sectionmismatches
	remote: Counting objects: 118, done.
	remote: error: unable to find 40aaeb204dc04d3cf15c060133f65538b43b13b0
	remote: Compressing objects: 100% (83/83), done.
	remote: fatal: unable to read 40aaeb204dc04d3cf15c060133f65538b43b13b0
	error: git upload-pack: git-pack-objects died with error.
	fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
	remote: aborting due to possible repository corruption on the remote side.
	fatal: protocol error: bad pack header

I don't know what 40aaeb204dc04d3cf15c060133f65538b43b13b0 is, but I
think it's not necessary for the sectionmismatches branch:

	ukl@hostname:~/path2/linux-2.6$ git format-patch linus/master..sectionmismatches
	0001-wip-enable-DEBUG_SECTION_MISMATCH.patch
	0002-ARM-sa1111-move-__sa1111_probe-to-.devinit.text.patch
	0003-ARM-omap1-nokia770-mark-some-functions-__init.patch
	0004-ARM-omap-fb-move-omap_init_fb-to-.init.text.patch
	0005-ARM-omap-fb-move-omapfb_reserve_sram-to-.init.text.patch
	0006-ARM-omap-fb-move-get_fbmem_region-to-.init.text.patch
	0007-ARM-omap-move-omap_get_config-et-al.-to-.init.text.patch
	0008-wip-ARM-omap-move-omap_board_config_kernel-to-.init..patch
	0009-ARM-omap-ams-delta-move-config-to-.init.data.patch
	0010-MTD-pxa2xx-move-pxa2xx_flash_probe-to-.devinit.text.patch
	0011-VIDEO-sa1100fb-register-driver-using-platform_driver.patch
	0012-ARM-s3c64xx-don-t-put-smartq_bl_init-in-.init.text.patch
	0013-ARM-s3c64xx-don-t-put-smartq7_leds-in-.init.data.patch
	0014-ARM-s3c64xx-don-t-put-smartq5_leds-in-.init.data.patch
	0015-ARM-nomadik-move-nmk_gpio_probe-to-.devinit.text.patch

and linus/master is contained in ~/path1/linux-2.6, too.

Bundling doesn't work either:

	ukl@hostname:~/path2/linux-2.6$ git bundle create tralala linus/master..sectionmismatches
	Counting objects: 118, done.
	error: unable to find 40aaeb204dc04d3cf15c060133f65538b43b13b0
	Delta compression using up to 8 threads.
	Compressing objects: 100% (83/83), done.
	fatal: unable to read 40aaeb204dc04d3cf15c060133f65538b43b13b0
	error: pack-objects died

git gc fails with a different object:

	ukl@hostname:~/path2/linux-2.6$ git gc
	error: Could not read f6b6cb2336198913371e66664f28c135df01aea5
	fatal: Failed to traverse parents of commit 76d1acb95eef413a2501a63cb7f7f4036b71ed37
	error: failed to run repack

(git gc is fine in ~/path1/linux-2.6)

	ukl@hostname:~$ git version
	git version 1.7.2.3

As a side note I have the general feeling that git recently started to
do more things than necessary (e.g. sometimes `git stash pop` takes >1s
(not mesured) between the status stuff (up to "no changes added to
commit (use ...)") and "Dropped refs/stash@{0} ($commitid)".  I wonder
what git stash is doing during that time.) I don't know if this is the
problem here, though.

Best regards
Uwe

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

             reply	other threads:[~2010-10-19 16:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-19 16:09 Uwe Kleine-König [this message]
2010-10-19 18:39 ` fetch and bundle don't work in (semi-)broken repo Jonathan Nieder
2010-10-19 20:11   ` Uwe Kleine-König
2010-10-19 20:48     ` Nicolas Pitre
2010-10-19 21:02       ` Jonathan Nieder
2010-10-20  3:06         ` Nicolas Pitre
2010-10-20  7:41           ` Uwe Kleine-König
2010-10-20 13:38             ` Nicolas Pitre
     [not found]               ` <20101020150810.GE19834@pengutronix.de>
     [not found]                 ` <alpine.LFD.2.00.1010201301130.2764@xanadu.home>
2010-10-21  7:11                   ` format-patch broken [Was: fetch and bundle don't work in (semi-)broken repo] Uwe Kleine-König
2010-10-21  8:12                     ` Uwe Kleine-König
2010-10-22  3:53                     ` Nicolas Pitre
2010-10-20  7:59       ` fetch and bundle don't work in (semi-)broken repo Uwe Kleine-König

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=20101019160957.GK11713@pengutronix.de \
    --to=u.kleine-koenig@pengutronix.de \
    --cc=git@vger.kernel.org \
    /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).