From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Oct 2018 05:22:15 +0000 (+0900)
Subject: Merge branch 'ld/p4-unshelve'
X-Git-Tag: v2.20.0-rc0~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e5d4548563ce2cab86005360b4bff78bb6b473e;p=thirdparty%2Fgit.git

Merge branch 'ld/p4-unshelve'

"git p4 unshelve" improvements.

* ld/p4-unshelve:
  git-p4: fully support unshelving changelists
  git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
  git-p4: do not fail in verbose mode for missing 'fileSize' key
---

1e5d4548563ce2cab86005360b4bff78bb6b473e