From 627ddc07740ca2bcc5fa1045762ae0d8df93c841 Mon Sep 17 00:00:00 2001
From: uttk <46495635+uttk@users.noreply.github.com>
Date: Wed, 12 Oct 2022 02:14:56 +0000
Subject: [PATCH 1/2] fix: Fix useMaxWidth option for git graph

---
 packages/mermaid/src/diagrams/git/gitGraphRenderer.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js
index e15e43ac3..0b52b0360 100644
--- a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js
+++ b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js
@@ -495,7 +495,6 @@ const drawBranches = (svg, branches) => {
  */
 export const draw = function (txt, id, ver, diagObj) {
   clear();
-  const conf = getConfig();
   const gitGraphConfig = getConfig().gitGraph;
   // try {
   log.debug('in gitgraph renderer', txt + '\n', 'id:', id, ver);
@@ -523,7 +522,7 @@ export const draw = function (txt, id, ver, diagObj) {
   drawCommits(diagram, allCommitsDict, true);
 
   // Setup the view box and size of the svg element
-  setupGraphViewbox(undefined, diagram, gitGraphConfig.diagramPadding, conf.useMaxWidth);
+  setupGraphViewbox(undefined, diagram, gitGraphConfig.diagramPadding, gitGraphConfig.useMaxWidth);
 };
 
 export default {

From 319f925bdd3a69a033947b90f79b98f67f7b23b7 Mon Sep 17 00:00:00 2001
From: uttk <46495635+uttk@users.noreply.github.com>
Date: Mon, 17 Oct 2022 03:07:10 +0000
Subject: [PATCH 2/2] fix: Fixed git graph to use global setting if
 `useMaxWidth` option is not set

---
 packages/mermaid/src/diagrams/git/gitGraphRenderer.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js
index 0b52b0360..71698a500 100644
--- a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js
+++ b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js
@@ -495,7 +495,8 @@ const drawBranches = (svg, branches) => {
  */
 export const draw = function (txt, id, ver, diagObj) {
   clear();
-  const gitGraphConfig = getConfig().gitGraph;
+  const conf = getConfig();
+  const gitGraphConfig = conf.gitGraph;
   // try {
   log.debug('in gitgraph renderer', txt + '\n', 'id:', id, ver);
 
@@ -522,7 +523,12 @@ export const draw = function (txt, id, ver, diagObj) {
   drawCommits(diagram, allCommitsDict, true);
 
   // Setup the view box and size of the svg element
-  setupGraphViewbox(undefined, diagram, gitGraphConfig.diagramPadding, gitGraphConfig.useMaxWidth);
+  setupGraphViewbox(
+    undefined,
+    diagram,
+    gitGraphConfig.diagramPadding,
+    gitGraphConfig.useMaxWidth ?? conf.useMaxWidth
+  );
 };
 
 export default {