Re: git format-patch lost the last part when branch merge

From: Jeff King <peff@peff.net>
Date: Feb 22, 2021, 22:57 UTC
Message-ID: <YDQ27qbbblPfLCpU@coredump.intra.peff.net>
In-Reply-To: <20210222211621.0C5D.409509F4@e16-tech.com>

On Mon, Feb 22, 2021 at 09:16:21PM +0800, Wang Yugui wrote:

Show 16 quoted lines

> git format-patch lost the last part when branch merge
> 
> Here is an example.
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> Merge tag 'for-5.12/block-2021-02-17' of git://git.kernel.dk/linux-block
> 
> 1, from the web interface,
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/fs/btrfs?id=582cd91f69de8e44857cb610ebca661dac8656b7
> 
> the last part 'diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c' can be confirmed.
> 
> 2, but from ' commit | 582cd91f69de8e44857cb610ebca661dac8656b7 (patch)' of this web page,
> the last part 'diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c' is not in the patch file.
> 
> 3, git format-patch 4f016a316f22.. fs/btrfs/ will not output 'diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c' too.

This is expected. Format-patch omits merge commits entirely, as they can't be formatted as a simple diff that can be applied.

There are lots of ways to look at the diff of a merge. By default, `git show` will show a combined diff, which omits hunks where one side was taken verbatim, but otherwise shows what each side did.

The diff shown in the link above is a diff against the first-parent (which you can also get locally with `git show --first-parent 582cd91`). One _could_ apply that diff onto the first parent to achieve the same tree as the merge plus all of the commits that got merged in. But it wouldn't make any sense to apply that (aside from conflict resolution, it would be redundant with all of the commits that format-patch just output!).

You could imagine ways for format-patch to represent the conflict resolution done in a merge, but it's not quite trivial, and nobody has done it yet.

Depending on why you're using format-patch, the solution may be one of:

  - use "git log --cc" instead, which shows the merges using combined
    diffs

  - use "git bundle" instead, which reproduces the whole history graph,
    including merges (though obviously you cannot then re-apply the
    commits onto a different history)

-Peff