Keep local branch name when pushing wip/phab/ branch to remote

Differential Revision: https://phabricator.freedesktop.org/D470

1 files changed, 9 insertions, 1 deletions

diff --git a/git-phab b/git-phab
index 89e736b..48fb2e7 100755
--- a/git-phab
+++ b/git-phab
@@ -201,7 +201,15 @@ class GitPhab:
         return json.loads(output.decode('utf-8'))
 
     def get_wip_branch(self):
-        return "wip/phab/" + self.task
+        if self.repo.head.reference:
+            name = self.repo.head.reference.name
+            name = name[name.rfind('/') + 1:]
+            if not name.startswith(self.task):
+                name = self.task + '-' + name
+        else:
+            name = self.task
+
+        return "wip/phab/" + name
 
     def read_arcconfig(self):
         path = os.path.join(self.repo.working_tree_dir, '.arcconfig')