From 4f96116c43257d7e34e5d09b2c8db524e8e51156 Mon Sep 17 00:00:00 2001
From: Elliot Nelson <nelson.work@gmail.com>
Date: Sun, 18 Sep 2022 08:59:47 -0400
Subject: [PATCH] Update src/diagrams/git/parser/gitGraph.jison

Co-authored-by: Alois Klink <alois@aloisklink.com>
---
 src/diagrams/git/parser/gitGraph.jison | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/diagrams/git/parser/gitGraph.jison b/src/diagrams/git/parser/gitGraph.jison
index b3fb805af..18eca1f08 100644
--- a/src/diagrams/git/parser/gitGraph.jison
+++ b/src/diagrams/git/parser/gitGraph.jison
@@ -117,9 +117,9 @@ branchStatement
     ;
 
 cherryPickStatement
-    : CHERRY_PICK COMMIT_ID STR {yy.cherryPick($3, '')}
-    | CHERRY_PICK COMMIT_ID STR COMMIT_TAG STR {yy.cherryPick($3, $4)}
-    | CHERRY_PICK COMMIT_TAG STR COMMIT_ID STR {yy.cherryPick($4, $3)}
+    : CHERRY_PICK COMMIT_ID STR {yy.cherryPick($3, '', '')}
+    | CHERRY_PICK COMMIT_ID STR COMMIT_TAG STR {yy.cherryPick($3, '', $5)}
+    | CHERRY_PICK COMMIT_TAG STR COMMIT_ID STR {yy.cherryPick($5, '', $3)}
     ;
 
 mergeStatement