Re: [PATCH] Document --ignore-if-in-upstream in git-format-patch

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Thu, 18 Jan 2007, David Kågedal wrote:

> Someone who knows how it *actually* works is encouraged to send a
> better explanation.

Nice try... Unfortunately, I don't have time to do it.

> +--ignore-if-in-upstream::
> +	Do not include the same patch twice.  If there are two commits
> +	that would produce identical patches, the second one is
> +	excluded from the output.

This is not what it does, though. (If in doubt, use the source, Luke).

Given a range upstream..localbranch, --ignore-if-in-upstream looks at all 
diffs associated with commits in localbranch..upstream (i.e. all commits 
upstream has, but not localbranch), and when traversing 
upstream..localbranch to output the commits with diffs, drops those at the 
floor which were already seen in localbranch..upstream.

The way it does this is by hashing the diffs, and check only the hashes.

Ciao,
Dscho

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]