Re: : Networking

From: Petr Baudis <pasky@ucw.cz>
Date: Apr 26, 2005, 18:33 UTC
Message-ID: <20050426183350.GB13224@pasky.ji.cz>
In-Reply-To: <20050426005725.6bfe6135.akpm@osdl.org>

Dear diary, on Tue, Apr 26, 2005 at 09:57:25AM CEST, I got a letter where Andrew Morton <akpm@osdl.org> told me that...

> c) To generate -mm's linus.patch (patch against 2.6.12-rc3):
> 
> 	git pull origin
> 	git diff -r v2.6.12-rc3 > ../25/patches/linus.patch

(Mainly for people not familiar with git-pasky - this merged origin to the working tree since it was tracked branch - that's what origin is by default after git init.)

Show 6 quoted lines

> d) To generate davem's tree (patch against linus's current tree (ie: patch
>    against 2.6.12-rc3+linus.patch)):
> 
> 	git pull git-net
> 	MERGE_BASE=$(merge-base $(cat .git/heads/origin ) $(cat .git/heads/git-net))
> 	git diff -r $MERGE_BASE:$(cat .git/heads/git-net) > ../25/patches/git-net.patch

This is the bad way; I think this suffers of basically the same problems as my ancient merging by "forward-patching". You should probably do a regular merge:

	git pull git-net
	git merge git-net
	git diff -p

The last command will show diff between current tree and the first parent; that amounts the merged patch in this case.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor