From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Dec 2015 21:58:57 +0000 (-0800)
Subject: Merge branch 'sh/p4-multi-depot'
X-Git-Tag: v2.7.0-rc3~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aecb9979df1403923d66e7fc70b0374f1765b679;p=thirdparty%2Fgit.git

Merge branch 'sh/p4-multi-depot'

"git p4" when interacting with multiple depots at the same time
used to incorrectly drop changes.

* sh/p4-multi-depot:
  git-p4: reduce number of server queries for fetches
  git-p4: support multiple depot paths in p4 submit
  git-p4: failing test case for skipping changes with multiple depots
---

aecb9979df1403923d66e7fc70b0374f1765b679