* Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I
@ 2005-04-20 23:06 Steven Cole
2005-04-20 23:12 ` Petr Baudis
0 siblings, 1 reply; 6+ messages in thread
From: Steven Cole @ 2005-04-20 23:06 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
After getting the latest tarball, and make, make install:
[steven@spc git-pasky-0.6.2]$ git pull pasky
MOTD: Welcome to Petr Baudis' rsync archive.
MOTD:
MOTD: If you are pulling my git branch, please do not repeat that
MOTD: every five minutes or so - new stuff is likely not going to
MOTD: appear so fast, and my line is not that thick. Nothing wrong
MOTD: with pulling every half an hour or so, of course.
MOTD:
MOTD: Feel free to contact me at <pasky@ucw.cz>, shall you have
MOTD: any questions or suggestions.
receiving file list ... done
2e/1f16579fdcd9cd5d242f53a3cfaad52ac5d207
3e/f49665799151ced5e03ae1d544b1d67a6b7e5b
74/b4083d67eda87d88a6f92c6c66877bba8bda8a
7f/621eae988378ee776c040a5856e873e41691e1
a2/44b27ac61489b7d7fa4246e82479897d3bb886
a3/87546d148df5718a9c53bbe0cbea441e793d98
a4/6844fcb6afef1f7a2d93f391c82f08ea322221
a6/7b79e97f9db01bc270a07f3be9cda610845128
ba/4c6268d14989801b15e87cab98f6a236cc5e7f
f9/3b5e3d8a427d93e7e5125b55b17cd1a9479af9
wrote 228 bytes read 99996 bytes 6466.06 bytes/sec
total size is 1753925 speedup is 17.50
receiving file list ... done
wrote 62 bytes read 633 bytes 198.57 bytes/sec
total size is 369 speedup is 0.53
Tree change: 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea322221
*100755->100755 blob a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a gitcancel.sh
Tracked branch, applying changes...
Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> a46844fcb6afef1f7a2d93f391c82f08ea322221
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.
Steven
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I 2005-04-20 23:06 Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I Steven Cole @ 2005-04-20 23:12 ` Petr Baudis 2005-04-20 23:15 ` Steven Cole 0 siblings, 1 reply; 6+ messages in thread From: Petr Baudis @ 2005-04-20 23:12 UTC (permalink / raw) To: Steven Cole; +Cc: git Dear diary, on Thu, Apr 21, 2005 at 01:06:09AM CEST, I got a letter where Steven Cole <elenstev@mesatop.com> told me that... > After getting the latest tarball, and make, make install: > > Tree change: 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea322221 > *100755->100755 blob a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a gitcancel.sh > Tracked branch, applying changes... > Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> a46844fcb6afef1f7a2d93f391c82f08ea322221 > 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:a46844fcb6afef1f7a2d93f391c82f08ea32222 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I 2005-04-20 23:12 ` Petr Baudis @ 2005-04-20 23:15 ` Steven Cole 2005-04-21 0:20 ` Steven Cole 0 siblings, 1 reply; 6+ messages in thread From: Steven Cole @ 2005-04-20 23:15 UTC (permalink / raw) To: Petr Baudis; +Cc: git 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 <elenstev@mesatop.com> told me that... > > After getting the latest tarball, and make, make install: > > > > Tree change: 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea322221 > > *100755->100755 blob a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a gitcancel.sh > > Tracked branch, applying changes... > > Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> a46844fcb6afef1f7a2d93f391c82f08ea322221 > > 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:a46844fcb6afef1f7a2d93f391c82f08ea32222 > > tell you? [steven@spc git-pasky-0.6.2]$ git diff -r 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea32222 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 <stuff_from_above" if that's what's needed, same with git apply. Corrrections to syntax apprceciated. Steven ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I 2005-04-20 23:15 ` Steven Cole @ 2005-04-21 0:20 ` Steven Cole 2005-04-21 7:11 ` Petr Baudis 0 siblings, 1 reply; 6+ messages in thread From: Steven Cole @ 2005-04-21 0:20 UTC (permalink / raw) To: Petr Baudis; +Cc: git 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 <elenstev@mesatop.com> told me that... > > > After getting the latest tarball, and make, make install: > > > > > > Tree change: 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea322221 > > > *100755->100755 blob a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67->74b4083d67eda87d88a6f92c6c66877bba8bda8a gitcancel.sh > > > Tracked branch, applying changes... > > > Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> a46844fcb6afef1f7a2d93f391c82f08ea322221 > > > 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:a46844fcb6afef1f7a2d93f391c82f08ea32222 > > > > tell you? > > [steven@spc git-pasky-0.6.2]$ git diff -r 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea32222 > 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 <stuff_from_above" if that's what's needed, > same with git apply. Corrrections to syntax apprceciated. > Steven Actually, I meant "patch -p1 <stuff_from_above". But before doing that, I did a fsck-cache as follows, with these results. This seems damaged. [steven@spc git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/HEAD) root 1bf00e46973f7f1c40bc898f1346a1273f0a347f unreachable commit 0128396de7ca8a7dc74f6fbff59a68bb781bb9b2 unreachable blob 012c82312c99606f914bda5c501b616237a3b7e9 unreachable tree 02a1b5337f78b807d4404f473e55c44f4273d2f8 [ lots of snippage...] unreachable blob fee26cc5b378819ff48ef8cb54c35744c0f1c17f unreachable tree fff7294434014ea68153770da3965ed315806499 [steven@spc git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/HEAD) | wc -l 467 I renamed the repo to git-pasky-0.6.2-damaged, and repeated untarring the 0.6.2 tarball, make, (didn't do make install this time), and repeated "git pull pasky" with similar results as before. [steven@spc git-pasky-0.6.2-damaged]$ cat .git/HEAD a46844fcb6afef1f7a2d93f391c82f08ea322221 [steven@spc git-pasky-0.6.2-damaged]$ cd ../git-pasky-0.6.2 [steven@spc git-pasky-0.6.2]$ cat .git/HEAD 7a4c67965de68ae7bc7aa1fde33f8eb9d8114697 Hope this helps, Steven ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I 2005-04-21 0:20 ` Steven Cole @ 2005-04-21 7:11 ` Petr Baudis 2005-04-21 10:23 ` Steven Cole 0 siblings, 1 reply; 6+ messages in thread From: Petr Baudis @ 2005-04-21 7:11 UTC (permalink / raw) To: Steven Cole; +Cc: git Dear diary, on Thu, Apr 21, 2005 at 02:20:27AM CEST, I got a letter where Steven Cole <elenstev@mesatop.com> told me that... > Actually, I meant "patch -p1 <stuff_from_above". So, how did it end up? 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. > > [steven@spc 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I 2005-04-21 7:11 ` Petr Baudis @ 2005-04-21 10:23 ` Steven Cole 0 siblings, 0 replies; 6+ messages in thread From: Steven Cole @ 2005-04-21 10:23 UTC (permalink / raw) To: Petr Baudis; +Cc: git 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 <elenstev@mesatop.com> told me that... > > Actually, I meant "patch -p1 <stuff_from_above". > > So, how did it end up? The file listed in the diff was already patched, so applying that output does the expected: [steven@spc git-pasky-0.6.2-damaged]$ patch -p1 <xyzzy.diff patching file gitcancel.sh Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file gitcancel.sh.rej > > 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. > > > > [steven@spc 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/*) > [steven@spc git-pasky-0.6.2]$ fsck-cache $(cat .git/heads/*) root 1bf00e46973f7f1c40bc898f1346a1273f0a347f dangling commit 2c1a8048d56cfbe0ff8a3d04c12d06f3832e7edc dangling commit a387546d148df5718a9c53bbe0cbea441e793d98 dangling blob d6ff9de73fc920cf1f27afac82571c4c58526b80 [steven@spc git-pasky-0.6.2]$ ./git-prune-script Ah, yes. Prune juice. [steven@spc git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/heads/*) root 1bf00e46973f7f1c40bc898f1346a1273f0a347f Now, all is well. Sorry for the noise. Steven ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2005-04-21 10:23 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2005-04-20 23:06 Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I Steven Cole 2005-04-20 23:12 ` Petr Baudis 2005-04-20 23:15 ` Steven Cole 2005-04-21 0:20 ` Steven Cole 2005-04-21 7:11 ` Petr Baudis 2005-04-21 10:23 ` Steven Cole
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).