From: Petr Baudis Date: Mon, 18 Apr 2005 10:24:12 GMT Subject: Re: [PATCH] Add help details to git help command. Message-ID: <20050418102412.GJ1461@pasky.ji.cz> In-Reply-To: <200504172242.26326.elenstev@mesatop.com> Dear diary, on Mon, Apr 18, 2005 at 06:42:26AM CEST, I got a letter where Steven Cole told me that... > There's a patch at the bottom of this, so please look at that first before > my reading my whining immediately below. > > I'm having some troubles with git pull, so this is just an ordinary diff. > Otherwise, I would have used the in-house diff command. > > > patch: **** Only garbage was found in the patch input. > > > Tracked branch, applying changes... > error: bad signature > error: verify header failed > read_cache: Invalid argument > error: bad signature > error: verify header failed > error: bad signature > error: verify header failed > read-tree $(tree-id) && update-cache --refresh The directory cache format changed, so it causes this. I'm hoping to release 0.5 with good cache prepackaged Real Soon Now (tm). :-) Note that then you will have to recover from the failed apply. If you had no local commits, it is easy - put that two IDs git pull told you to git diff and pipe it to git apply. If you had local commits, and have already GIT version with merge-base, do just git merge pasky and proceed with the merge. If you don't have merge-base, pass the first ID from git track to git merge with the -b argument. > This patch will provide the comment lines in the shell script associated > with the command, cleaned up a bit for presentation. > > BUGS: This will also print any comments in the entire file, which may > not be desired. If a command name and shell script filename > do not follow the usual convention, this won't work, e.g. ci for commit. Hey, those BUGS are the only slightly non-trivial thing on the whole thing! I could do this patch myself... ;-) Also, you don't want to print the first newline and the Copyright notices. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor