From: Steven Cole <elenstev@mesatop.com>
Date: Wed, 20 Apr 2005 23:15:00 GMT
Subject: Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I
Message-ID: <200504201715.00058.elenstev@mesatop.com>
In-Reply-To: <20050420231212.GN19112@pasky.ji.cz>

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