Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I
On Thursday 21 April 2005 01:11 am, Petr Baudis wrote: > Dear diary, on Thu, Apr 21, 2005 at 02:20:27AM CEST, I got a letter > where Steven Cole <[EMAIL PROTECTED]> told me that... > > Actually, I meant "patch -p1 > So, how did it end up? The file listed in the diff was already patched, so applying that output does the expected: [EMAIL PROTECTED] git-pasky-0.6.2-damaged]$ patch -p1 > Actually, never mind. I forgot that I bring the local changes forward as > patches instead. So this is Harmless (tm). It means the patch containing > your local changes has just that kind of git diff output containing > filename: hash. I will probably just chain grep -v '^[^+-@ ]' in front > of patch. (Someone starting his filename with a space _deserves_ the > trouble. ;-) > > > But before doing that, I did a fsck-cache as follows, with these results. > > This seems damaged. > > > > [EMAIL PROTECTED] git-pasky-0.6.2]$ fsck-cache --unreachable $(cat > > .git/HEAD) > > You can't do just this. In Cogito repository, you may have multiple > branches, each with different HEAD of course. So you need to > > fsck-cache --unreachable $(cat .git/heads/*) > [EMAIL PROTECTED] git-pasky-0.6.2]$ fsck-cache $(cat .git/heads/*) root 1bf00e46973f7f1c40bc898f1346a1273f0a347f dangling commit 2c1a8048d56cfbe0ff8a3d04c12d06f3832e7edc dangling commit a387546d148df5718a9c53bbe0cbea441e793d98 dangling blob d6ff9de73fc920cf1f27afac82571c4c58526b80 [EMAIL PROTECTED] git-pasky-0.6.2]$ ./git-prune-script Ah, yes. Prune juice. [EMAIL PROTECTED] git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/heads/*) root 1bf00e46973f7f1c40bc898f1346a1273f0a347f Now, all is well. Sorry for the noise. Steven - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I
Dear diary, on Thu, Apr 21, 2005 at 02:20:27AM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > Actually, I meant "patch -p1 But before doing that, I did a fsck-cache as follows, with these results. > This seems damaged. > > [EMAIL PROTECTED] git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/HEAD) You can't do just this. In Cogito repository, you may have multiple branches, each with different HEAD of course. So you need to fsck-cache --unreachable $(cat .git/heads/*) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I
On Wednesday 20 April 2005 05:15 pm, Steven Cole wrote: > On Wednesday 20 April 2005 05:12 pm, Petr Baudis wrote: > > Dear diary, on Thu, Apr 21, 2005 at 01:06:09AM CEST, I got a letter > > where Steven Cole <[EMAIL PROTECTED]> told me that... > > > After getting the latest tarball, and make, make install: > > > > > > Tree change: > > > 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea31 > > > *100755->100755 blob > > > a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a > > > gitcancel.sh > > > Tracked branch, applying changes... > > > Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> > > > a46844fcb6afef1f7a2d93f391c82f08ea31 > > > on top of 55f9d5042603fff4ddfaf4e5f004d2995286d6d3... > > > patch: Only garbage was found in the patch input. > > > > > > This may be a harmless message, but I thought I'd bring it to your > > > attention. > > > > This _is_ weird. What does > > > > $ git diff -r > > 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea3 > > > > tell you? > > [EMAIL PROTECTED] git-pasky-0.6.2]$ git diff -r > 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea3 > Index: gitcancel.sh [ output snipped, see previous message for output] > > > What if you feed it to patch -p1? > I haven't done that yet, awaiting response to above. > > > What if you feed it to git > > apply? > > > > Thanks, > > > Your're welcome. I'll do the "git patch -p1 what's needed, > same with git apply. Corrrections to syntax apprceciated. > Steven Actually, I meant "patch -p1 http://vger.kernel.org/majordomo-info.html
Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I
On Wednesday 20 April 2005 05:12 pm, Petr Baudis wrote: > Dear diary, on Thu, Apr 21, 2005 at 01:06:09AM CEST, I got a letter > where Steven Cole <[EMAIL PROTECTED]> told me that... > > After getting the latest tarball, and make, make install: > > > > Tree change: > > 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea31 > > *100755->100755 blob > > a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a > > gitcancel.sh > > Tracked branch, applying changes... > > Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> > > a46844fcb6afef1f7a2d93f391c82f08ea31 > > on top of 55f9d5042603fff4ddfaf4e5f004d2995286d6d3... > > patch: Only garbage was found in the patch input. > > > > This may be a harmless message, but I thought I'd bring it to your > > attention. > > This _is_ weird. What does > > $ git diff -r > 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea3 > > tell you? [EMAIL PROTECTED] git-pasky-0.6.2]$ git diff -r 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea3 Index: gitcancel.sh === --- f29be8140c5f1175052ec96ad2fa2b2901fd6ba5/gitcancel.sh (mode:100755 sha1:a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67) +++ 2e1f16579fdcd9cd5d242f53a3cfaad52ac5d207/gitcancel.sh (mode:100755 sha1:74b4083d67eda87d88a6f92c6c66877bba8bda8a) @@ -13,6 +13,19 @@ [ -s ".git/add-queue" ] && rm $(cat .git/add-queue) rm -f .git/add-queue .git/rm-queue +# Undo seek? +branch= +[ -s .git/blocked ] && branch=$(grep '^seeked from ' .git/blocked | sed 's/^seeked from //') +if [ "$branch" ]; then + echo "Unseeking: $(cat .git/HEAD) -> $(cat ".git/heads/$branch")" + if [ -s ".git/heads/$branch" ]; then + rm .git/HEAD + ln -s "heads/$branch" .git/HEAD + else + echo "ERROR: Unknown branch $branch! Preserving HEAD." >&2 + fi +fi + rm -f .git/blocked .git/merging .git/merging-sym .git/merge-base read-tree $(tree-id) > What if you feed it to patch -p1? I haven't done that yet, awaiting response to above. > What if you feed it to git > apply? > > Thanks, > Your're welcome. I'll do the "git patch -p1 http://vger.kernel.org/majordomo-info.html
Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I
Dear diary, on Thu, Apr 21, 2005 at 01:06:09AM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > After getting the latest tarball, and make, make install: > > Tree change: > 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea31 > *100755->100755 blob > a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a > gitcancel.sh > Tracked branch, applying changes... > Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> > a46844fcb6afef1f7a2d93f391c82f08ea31 > on top of 55f9d5042603fff4ddfaf4e5f004d2995286d6d3... > patch: Only garbage was found in the patch input. > > This may be a harmless message, but I thought I'd bring it to your attention. This _is_ weird. What does $ git diff -r 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea3 tell you? What if you feed it to patch -p1? What if you feed it to git apply? Thanks, -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
