From 041d2aefc082c2883aa7e28ee3e4a990b3be9758 Mon Sep 17 00:00:00 2001
From: William Moorehouse <moorehousew@gmail.com>
Date: Wed, 28 Sep 2022 18:00:48 -0400
Subject: [PATCH] Respect --ckpt-dir command-line argument when merging models
 (#1261)

* Update .gitignore to ignore *all* checkpoint files in /models
* Fixed typo in UI
---
 .gitignore    | 2 +-
 modules/ui.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69ea78c5..b71e1875 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@ __pycache__
 /venv
 /tmp
 /model.ckpt
-/models/*.ckpt
+/models/**/*.ckpt
 /GFPGANv1.3.pth
 /gfpgan/weights/*.pth
 /ui-config.json
diff --git a/modules/ui.py b/modules/ui.py
index 4958036a..87024238 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -869,7 +869,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
     with gr.Blocks() as modelmerger_interface:
         with gr.Row().style(equal_height=False):
             with gr.Column(variant='panel'):
-                gr.HTML(value="<p>A merger of the two checkpoints will be generated in your <b>/models</b> directory.</p>")
+                gr.HTML(value="<p>A merger of the two checkpoints will be generated in your <b>checkpoint</b> directory.</p>")
                 
                 with gr.Row():
                     primary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_primary_model_name", label="Primary Model Name")