path: root/
diff options
authorSimon Williams <>2019-05-22 06:21:20 (GMT)
committerJunio C Hamano <>2019-05-28 17:54:42 (GMT)
commit0108f47eb30b9b473e044285b731e2fbca803170 (patch)
treebfe757b758a8e2ebeccb4c7297024a2b951e1a8f /
parentaeb582a98374c094361cba1bd756dc6307432c42 (diff)
git-p4: allow unshelving of branched files
When unshelving a changelist, git-p4 tries to work out the appropriate parent commit in a given branch (default: HEAD). To do this, it looks at the state of any pre-existing files in the target Perforce branch, omitting files added in the shelved changelist. Currently, only files added (or move targets) are classed as new. However, files integrated from other branches (i.e. a 'branch' action) also need to be considered as added, for this purpose. Signed-off-by: Simon Williams <> Acked-by: Luke Diamand <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 1 insertions, 1 deletions
diff --git a/ b/
index 5b79920..81a5258 100755
--- a/
+++ b/
@@ -1309,7 +1309,7 @@ class GitLFS(LargeFileSystem):
class Command:
delete_actions = ( "delete", "move/delete", "purge" )
- add_actions = ( "add", "move/add" )
+ add_actions = ( "add", "branch", "move/add" )
def __init__(self):
self.usage = "usage: %prog [options]"