Re: [question] retrieve some patches from another repository

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 20, 2010, 06:23 UTC
Message-ID: <7vljft5m7h.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100120054614.GA1965@crane-desktop>

Crane Cai <crane.cai@amd.com> writes:

> * merge point will cause duplicated patch generated, for example repo B has x,
>   y, z, then accepted by repo A in merge point, and then merge back to repo B
>   (they are different with commit id), they will generate 2 twice.

This is inevitable, if 'x' and (say) 'b' corresponds to each other but has textual changes due to different context.

> * some commits do not only change the driver source code, and they change some
>   other files also. Unfortunately git format-patch cut them. It cause compile
>   error.

You are probably running "format-patch a.. -- path/to/file.c". Try giving it the --full-diff option as well. We've recently discussed to make it the default for format-patch but the discussion thread petered out and didn't reach conclusion.