Re: [PATCH v2] git-p4: Fix multi-path changelist empty commits

On 19 December 2016 at 17:49, Junio C Hamano [off-list ref] wrote:

George Vanburgh [off-list ref] writes:

quoted

From: George Vanburgh <redacted>

When importing from multiple perforce paths - we may attempt to import
a changelist that contains files from two (or more) of these depot
paths. Currently, this results in multiple git commits - one
containing the changes, and the other(s) as empty commit(s). This
behavior was introduced in commit 1f90a64
("git-p4: reduce number of server queries for fetches", 2015-12-19).

Reproduction Steps:

1. Have a git repo cloned from a perforce repo using multiple depot
paths (e.g. //depot/foo and //depot/bar).
2. Submit a single change to the perforce repo that makes changes in
both //depot/foo and //depot/bar.
3. Run "git p4 sync" to sync the change from #2.

Change is synced as multiple commits, one for each depot path that was
affected.

Using a set, instead of a list inside p4ChangesForPaths() ensures that
each changelist is unique to the returned list, and therefore only a
single commit is generated for each changelist.

Reported-by: James Farwell <redacted>
Signed-off-by: George Vanburgh <redacted>
---

Thanks, George.  Luke, can I add your "Reviewed-by:" here?

Yes, thanks.

Luke