{"thread":{"id":"181","subject":"Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I","startedAt":"2005-04-20T23:06:09Z","lastAt":"2005-04-21T10:23:45Z","messageCount":6,"participants":["Steven Cole","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"1055","messageId":"200504201706.09656.elenstev@mesatop.com","threadId":"181","inReplyTo":null,"subject":"Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I","fromName":"Steven Cole","fromEmail":"elenstev@mesatop.com","sentAt":"2005-04-20T23:06:09Z","receivedAt":"2005-04-20T23:06:09Z","isPatch":false,"sender":{"key":"elenstev@mesatop.com","avatar":null},"body":"After getting the latest tarball, and make, make install:\n\n[steven@spc git-pasky-0.6.2]$ git pull pasky\nMOTD:  Welcome to Petr Baudis' rsync archive.\nMOTD:\nMOTD:  If you are pulling my git branch, please do not repeat that\nMOTD:  every five minutes or so - new stuff is likely not going to\nMOTD:  appear so fast, and my line is not that thick. Nothing wrong\nMOTD:  with pulling every half an hour or so, of course.\nMOTD:\nMOTD:  Feel free to contact me at <pasky@ucw.cz>, shall you have\nMOTD:  any questions or suggestions.\n\n\nreceiving file list ... done\n2e/1f16579fdcd9cd5d242f53a3cfaad52ac5d207\n3e/f49665799151ced5e03ae1d544b1d67a6b7e5b\n74/b4083d67eda87d88a6f92c6c66877bba8bda8a\n7f/621eae988378ee776c040a5856e873e41691e1\na2/44b27ac61489b7d7fa4246e82479897d3bb886\na3/87546d148df5718a9c53bbe0cbea441e793d98\na4/6844fcb6afef1f7a2d93f391c82f08ea322221\na6/7b79e97f9db01bc270a07f3be9cda610845128\nba/4c6268d14989801b15e87cab98f6a236cc5e7f\nf9/3b5e3d8a427d93e7e5125b55b17cd1a9479af9\n\nwrote 228 bytes  read 99996 bytes  6466.06 bytes/sec\ntotal size is 1753925  speedup is 17.50\n\nreceiving file list ... done\n\nwrote 62 bytes  read 633 bytes  198.57 bytes/sec\ntotal size is 369  speedup is 0.53\nTree change: 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea322221\n*100755->100755 blob    a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a     gitcancel.sh\nTracked branch, applying changes...\nFast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> a46844fcb6afef1f7a2d93f391c82f08ea322221\n        on top of 55f9d5042603fff4ddfaf4e5f004d2995286d6d3...\npatch: **** Only garbage was found in the patch input.\n\nThis may be a harmless message, but I thought I'd bring it to your attention.\n\nSteven\n"},{"id":"1056","messageId":"20050420231212.GN19112@pasky.ji.cz","threadId":"181","inReplyTo":"200504201706.09656.elenstev@mesatop.com","subject":"Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-04-20T23:12:12Z","receivedAt":"2005-04-20T23:12:12Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Thu, Apr 21, 2005 at 01:06:09AM CEST, I got a letter\nwhere Steven Cole <elenstev@mesatop.com> told me that...\n> After getting the latest tarball, and make, make install:\n> \n> Tree change: 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea322221\n> *100755->100755 blob    a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a     gitcancel.sh\n> Tracked branch, applying changes...\n> Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> a46844fcb6afef1f7a2d93f391c82f08ea322221\n>         on top of 55f9d5042603fff4ddfaf4e5f004d2995286d6d3...\n> patch: **** Only garbage was found in the patch input.\n> \n> This may be a harmless message, but I thought I'd bring it to your attention.\n\nThis _is_ weird. What does\n\n\t$ git diff -r 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea32222\n\ntell you? What if you feed it to patch -p1? What if you feed it to git\napply?\n\nThanks,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"1057","messageId":"200504201715.00058.elenstev@mesatop.com","threadId":"181","inReplyTo":"20050420231212.GN19112@pasky.ji.cz","subject":"Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I","fromName":"Steven Cole","fromEmail":"elenstev@mesatop.com","sentAt":"2005-04-20T23:15:00Z","receivedAt":"2005-04-20T23:15:00Z","isPatch":false,"sender":{"key":"elenstev@mesatop.com","avatar":null},"body":"On Wednesday 20 April 2005 05:12 pm, Petr Baudis wrote:\n> Dear diary, on Thu, Apr 21, 2005 at 01:06:09AM CEST, I got a letter\n> where Steven Cole <elenstev@mesatop.com> told me that...\n> > After getting the latest tarball, and make, make install:\n> > \n> > Tree change: 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea322221\n> > *100755->100755 blob    a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a     gitcancel.sh\n> > Tracked branch, applying changes...\n> > Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> a46844fcb6afef1f7a2d93f391c82f08ea322221\n> >         on top of 55f9d5042603fff4ddfaf4e5f004d2995286d6d3...\n> > patch: **** Only garbage was found in the patch input.\n> > \n> > This may be a harmless message, but I thought I'd bring it to your attention.\n> \n> This _is_ weird. What does\n> \n> \t$ git diff -r 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea32222\n> \n> tell you? \n\n[steven@spc git-pasky-0.6.2]$ git diff -r 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea32222\nIndex: gitcancel.sh\n===================================================================\n--- f29be8140c5f1175052ec96ad2fa2b2901fd6ba5/gitcancel.sh  (mode:100755 sha1:a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67)\n+++ 2e1f16579fdcd9cd5d242f53a3cfaad52ac5d207/gitcancel.sh  (mode:100755 sha1:74b4083d67eda87d88a6f92c6c66877bba8bda8a)\n@@ -13,6 +13,19 @@\n [ -s \".git/add-queue\" ] && rm $(cat .git/add-queue)\n rm -f .git/add-queue .git/rm-queue\n\n+# Undo seek?\n+branch=\n+[ -s .git/blocked ] && branch=$(grep '^seeked from ' .git/blocked | sed 's/^seeked from //')\n+if [ \"$branch\" ]; then\n+       echo \"Unseeking: $(cat .git/HEAD) -> $(cat \".git/heads/$branch\")\"\n+       if [ -s \".git/heads/$branch\" ]; then\n+               rm .git/HEAD\n+               ln -s \"heads/$branch\" .git/HEAD\n+       else\n+               echo \"ERROR: Unknown branch $branch! Preserving HEAD.\" >&2\n+       fi\n+fi\n+\n rm -f .git/blocked .git/merging .git/merging-sym .git/merge-base\n read-tree $(tree-id)\n\n\n\n\n\n> What if you feed it to patch -p1? \nI haven't done that yet, awaiting response to above.\n\n> What if you feed it to git  \n> apply?\n> \n> Thanks,\n> \nYour're welcome.  I'll do the \"git patch -p1 <stuff_from_above\" if that's what's needed,\nsame with git apply.  Corrrections to syntax apprceciated.\nSteven\n"},{"id":"1071","messageId":"200504201820.27497.elenstev@mesatop.com","threadId":"181","inReplyTo":"200504201715.00058.elenstev@mesatop.com","subject":"Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I","fromName":"Steven Cole","fromEmail":"elenstev@mesatop.com","sentAt":"2005-04-21T00:20:27Z","receivedAt":"2005-04-21T00:20:27Z","isPatch":false,"sender":{"key":"elenstev@mesatop.com","avatar":null},"body":"On Wednesday 20 April 2005 05:15 pm, Steven Cole wrote:\n> On Wednesday 20 April 2005 05:12 pm, Petr Baudis wrote:\n> > Dear diary, on Thu, Apr 21, 2005 at 01:06:09AM CEST, I got a letter\n> > where Steven Cole <elenstev@mesatop.com> told me that...\n> > > After getting the latest tarball, and make, make install:\n> > > \n> > > Tree change: 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea322221\n> > > *100755->100755 blob    a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a     gitcancel.sh\n> > > Tracked branch, applying changes...\n> > > Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> a46844fcb6afef1f7a2d93f391c82f08ea322221\n> > >         on top of 55f9d5042603fff4ddfaf4e5f004d2995286d6d3...\n> > > patch: **** Only garbage was found in the patch input.\n> > > \n> > > This may be a harmless message, but I thought I'd bring it to your attention.\n> > \n> > This _is_ weird. What does\n> > \n> > \t$ git diff -r 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea32222\n> > \n> > tell you? \n> \n> [steven@spc git-pasky-0.6.2]$ git diff -r 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea32222\n> Index: gitcancel.sh\n[ output snipped, see previous message for output]\n> \n> > What if you feed it to patch -p1? \n> I haven't done that yet, awaiting response to above.\n> \n> > What if you feed it to git  \n> > apply?\n> > \n> > Thanks,\n> > \n> Your're welcome.  I'll do the \"git patch -p1 <stuff_from_above\" if that's what's needed,\n> same with git apply.  Corrrections to syntax apprceciated.\n> Steven\n\nActually, I meant \"patch -p1 <stuff_from_above\".\n\nBut before doing that, I did a fsck-cache as follows, with these results.\nThis seems damaged.\n\n[steven@spc git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/HEAD)\nroot 1bf00e46973f7f1c40bc898f1346a1273f0a347f\nunreachable commit 0128396de7ca8a7dc74f6fbff59a68bb781bb9b2\nunreachable blob 012c82312c99606f914bda5c501b616237a3b7e9\nunreachable tree 02a1b5337f78b807d4404f473e55c44f4273d2f8\n\n[ lots of snippage...]\n\nunreachable blob fee26cc5b378819ff48ef8cb54c35744c0f1c17f\nunreachable tree fff7294434014ea68153770da3965ed315806499\n\n[steven@spc git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/HEAD) | wc -l\n467\n\nI renamed the repo to git-pasky-0.6.2-damaged, and repeated untarring the 0.6.2 tarball,\nmake, (didn't do make install this time), and repeated \"git pull pasky\" with\nsimilar results as before.\n\n[steven@spc git-pasky-0.6.2-damaged]$ cat .git/HEAD\na46844fcb6afef1f7a2d93f391c82f08ea322221\n[steven@spc git-pasky-0.6.2-damaged]$ cd ../git-pasky-0.6.2\n[steven@spc git-pasky-0.6.2]$ cat .git/HEAD\n7a4c67965de68ae7bc7aa1fde33f8eb9d8114697\n\nHope this helps,\nSteven\n\n"},{"id":"1102","messageId":"20050421071104.GC31910@pasky.ji.cz","threadId":"181","inReplyTo":"200504201820.27497.elenstev@mesatop.com","subject":"Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-04-21T07:11:05Z","receivedAt":"2005-04-21T07:11:05Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Thu, Apr 21, 2005 at 02:20:27AM CEST, I got a letter\nwhere Steven Cole <elenstev@mesatop.com> told me that...\n> Actually, I meant \"patch -p1 <stuff_from_above\".\n\nSo, how did it end up?\n\nActually, never mind. I forgot that I bring the local changes forward as\npatches instead. So this is Harmless (tm). It means the patch containing\nyour local changes has just that kind of git diff output containing\nfilename: hash. I will probably just chain grep -v '^[^+-@ ]' in front\nof patch. (Someone starting his filename with a space _deserves_ the\ntrouble. ;-)\n\n> But before doing that, I did a fsck-cache as follows, with these results.\n> This seems damaged.\n> \n> [steven@spc git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/HEAD)\n\nYou can't do just this. In Cogito repository, you may have multiple\nbranches, each with different HEAD of course. So you need to\n\n\tfsck-cache --unreachable $(cat .git/heads/*)\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"1115","messageId":"200504210423.47369.elenstev@mesatop.com","threadId":"181","inReplyTo":"20050421071104.GC31910@pasky.ji.cz","subject":"Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I","fromName":"Steven Cole","fromEmail":"elenstev@mesatop.com","sentAt":"2005-04-21T10:23:45Z","receivedAt":"2005-04-21T10:23:45Z","isPatch":false,"sender":{"key":"elenstev@mesatop.com","avatar":null},"body":"On Thursday 21 April 2005 01:11 am, Petr Baudis wrote:\n> Dear diary, on Thu, Apr 21, 2005 at 02:20:27AM CEST, I got a letter\n> where Steven Cole <elenstev@mesatop.com> told me that...\n> > Actually, I meant \"patch -p1 <stuff_from_above\".\n> \n> So, how did it end up?\n\nThe file listed in the diff was already patched, so applying that\noutput does the expected:\n[steven@spc git-pasky-0.6.2-damaged]$ patch -p1 <xyzzy.diff\npatching file gitcancel.sh\nReversed (or previously applied) patch detected!  Assume -R? [n] n\nApply anyway? [n] n\nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file gitcancel.sh.rej\n\n> \n> Actually, never mind. I forgot that I bring the local changes forward as\n> patches instead. So this is Harmless (tm). It means the patch containing\n> your local changes has just that kind of git diff output containing\n> filename: hash. I will probably just chain grep -v '^[^+-@ ]' in front\n> of patch. (Someone starting his filename with a space _deserves_ the\n> trouble. ;-)\n> \n> > But before doing that, I did a fsck-cache as follows, with these results.\n> > This seems damaged.\n> > \n> > [steven@spc git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/HEAD)\n> \n> You can't do just this. In Cogito repository, you may have multiple\n> branches, each with different HEAD of course. So you need to\n> \n> \tfsck-cache --unreachable $(cat .git/heads/*)\n> \n\n[steven@spc git-pasky-0.6.2]$ fsck-cache  $(cat .git/heads/*)\nroot 1bf00e46973f7f1c40bc898f1346a1273f0a347f\ndangling commit 2c1a8048d56cfbe0ff8a3d04c12d06f3832e7edc\ndangling commit a387546d148df5718a9c53bbe0cbea441e793d98\ndangling blob d6ff9de73fc920cf1f27afac82571c4c58526b80\n\n[steven@spc git-pasky-0.6.2]$ ./git-prune-script\n\nAh, yes. Prune juice.\n\n[steven@spc git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/heads/*)\nroot 1bf00e46973f7f1c40bc898f1346a1273f0a347f\n\nNow, all is well.  Sorry for the noise.\n\nSteven\n\n\n"}]}