about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-09-23T15·13-0400
committerglittershark <grfn@gws.fyi>2020-09-23T15·55+0000
commit353da315c49b4294ad7a507c33f7292b7d682082 (patch)
treed10e304c5333120e7cfaa08fb39507644bea0a08
parent4f7bb40a31bb9b7776abc4e83cfca052980e183c (diff)
fix(gs/emacs): Don't double up on branch prefix r/1814
magit-read-org-clubhouse-branch-name returns the branch with the prefix
in it already, so we don't need to add it again here.

Change-Id: I0e753173bc366a8458ccd38a936ae078bbac79f8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1999
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
-rw-r--r--users/glittershark/emacs.d/config.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el
index 3ca913805e..532579b52c 100644
--- a/users/glittershark/emacs.d/config.el
+++ b/users/glittershark/emacs.d/config.el
@@ -609,9 +609,7 @@
                             "origin/master")))
           (if (magit-rev-verify start-point)
               (when-let ((desc (magit-read-org-clubhouse-branch-name)))
-                (list
-                 (format "gs/ch%d/%s" story-id desc)
-                 start-point))
+                (list desc start-point))
             (user-error "Not a valid starting point: %s" choice)))
       (user-error "No currently clocked-in clubhouse story")))