From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 5 Feb 2019 22:26:10 +0000 (-0800)
Subject: Merge branch 'ld/git-p4-shelve-update-fix'
X-Git-Tag: v2.21.0-rc0~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40b8ba2c4458bd1ed6d32092712c07a4fc26e256;p=thirdparty%2Fgit.git

Merge branch 'ld/git-p4-shelve-update-fix'

"git p4" failed to update a shelved change when there were moved
files, which has been corrected.

* ld/git-p4-shelve-update-fix:
  git-p4: handle update of moved/copied files when updating a shelve
  git-p4: add failing test for shelved CL update involving move/copy
---

40b8ba2c4458bd1ed6d32092712c07a4fc26e256