Git でバージョン管理するリポジトリ内に、外部のリポジトリをサブモジュールとして配置して、そのサブモジュールを変更した際の、サブモジュールだけの差分（パッチ）をファイル出力するコマンド例を紹介します。
また、エクスプローラで操作できる Git クライアントソフト TortoiseGit のコミットのダイアログに表示されたサブモジュールの差分（パッチ）の情報の dirty 表記に関する推測も記述します。
※Git-2.49.0 (64 bit) を使用します。
サブモジュール内の変更は、ステージングされない例
Git のサブモジュールを使うと、リポジトリ内に、外部のリポジトリを分けて配置できます。
サブモジュールを使うと、ある Git リポジトリを別の Git リポジトリのサブディレクトリとして扱うことができるようになります。 これで、別のリポジトリをプロジェクト内にクローンしても自分のコミットは別管理とすることができるようになります。
Git – サブモジュール
この外部のリポジトリの作業ディレクトリを変更した結果、差分としては検出されても、リポジトリのコミット対象としてステージングされないことが git-status コマンドの出力結果でわかりました。
git status上記コマンドを、このリポジトリのフォルダを作業ディレクトリにしたコマンドディレクトリで十個すると、ステージングされない変更点 (Changes not staged for commit) として、一部のファイルが変更されているサブモジュールのフォルダが表示されました。
G:\Dev\Godot4GD\SakuraCrowd\SakuraCrowdGodotLib>git status
On branch develop
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
(commit or discard the untracked or modified content in submodules)
modified: third_party/Gut (modified content)
Untracked files:
(use "git add <file>..." to include in what will be committed)
addons/godot-git-plugin/
addons/my/
export_presets.cfg
icon.svg
icon.svg.import
project.godot
resource/
scene/
third_party/.gdignore
no changes added to commit (use "git add" and/or "git commit -a")
G:\Dev\Godot4GD\SakuraCrowd\SakuraCrowdGodotLib>git diff --cached third_party/Gut
G:\Dev\Godot4GD\SakuraCrowd\SakuraCrowdGodotLib>Displays paths that have differences between the index file and the current HEAD commit, paths that have differences between the working tree and the index file, and paths in the working tree that are not tracked by Git (and are not ignored by gitignore[5]). The first are what you would commit by running git commit; the second and third are what you could commit by running git add before running git commit.
インデックス ファイルと現在の HEAD コミットの間に差異があるパス、作業ツリーとインデックス ファイルの間に差異があるパス、Git によって追跡されない (そして gitignore[5] によって無視されない) 作業ツリー内のパスを表示します。 1 つ目は、git commit を実行してコミットするものです。 2 番目と 3 番目は、git commit を実行する前に git add を実行することでコミットできるものです。
Git – git-status Documentation と Google 翻訳
サブモジュール内の差分のパッチをファイル出力するコマンド例
サブモジュール内の変更を Git を用いて確認します。
git diff --submodule=diff > patch.diff上記のコマンドは git-diff でサブモジュールの差分を diff 形式でファイル出力するコマンド例です。
G:\Dev\Godot4GD\SakuraCrowd\SakuraCrowdGodotLib>git diff --submodule=diff > patch.diffShow changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk.
作業ツリーとインデックスまたはツリー間の変更、インデックスとツリー間の変更、2 つのツリー間の変更、マージから生じた変更、2 つの BLOB オブジェクト間の変更、またはディスク上の 2 つのファイル間の変更を表示します。
–submodule[=]
Specify how differences in submodules are shown. When specifying –submodule=short the short format is used. This format just shows the names of the commits at the beginning and end of the range. When –submodule or –submodule=log is specified, the log format is used. This format lists the commits in the range like git-submodule[1] summary does. When –submodule=diff is specified, the diff format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to diff.submodule or the short format if the config option is unset.サブモジュールの違いをどのように表示するかを指定します。 –submodule=short を指定すると、短い形式が使用されます。この形式では、範囲の先頭と末尾にあるコミットの名前が表示されるだけです。 –submodule または –submodule=log を指定すると、ログ形式が使用されます。この形式は、git-submodule[1] summary と同様に、範囲内のコミットをリストします。 –submodule=diff を指定すると、diff 形式が使用されます。この形式では、コミット範囲間のサブモジュールの内容の変更のインライン差分が表示されます。デフォルトは diff.submodule 、または構成オプションが設定されていない場合は短い形式になります。
Git – git-diff Documentation と Google 翻訳
コマンドを実行すると diff 形式の差分情報のテキストファイル patch.diff がカレントディレクトリに作成されました。
サブモジュール gut についてのリポジトリと作業ディレクトリとの差分が記述されています。
Submodule third_party/Gut contains modified content
diff --git a/third_party/Gut/addons/gut/GutScene.tscn b/third_party/Gut/addons/gut/GutScene.tscn
index 82638cc..57d7f03 100644
--- a/third_party/Gut/addons/gut/GutScene.tscn
+++ b/third_party/Gut/addons/gut/GutScene.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://m28heqtswbuq"]
-[ext_resource type="Script" uid="uid://bw7tukh738kw1" path="res://addons/gut/GutScene.gd" id="1_b4m8y"]
+[ext_resource type="Script" path="res://addons/gut/GutScene.gd" id="1_b4m8y"]
[ext_resource type="PackedScene" uid="uid://duxblir3vu8x7" path="res://addons/gut/gui/NormalGui.tscn" id="2_j6ywb"]
[ext_resource type="PackedScene" uid="uid://cnqqdfsn80ise" path="res://addons/gut/gui/MinGui.tscn" id="3_3glw1"]
diff --git a/third_party/Gut/addons/gut/fonts/AnonymousPro-Bold.ttf.import b/third_party/Gut/addons/gut/fonts/AnonymousPro-Bold.ttf.import
index a4fc7f2..de1351f 100644
--- a/third_party/Gut/addons/gut/fonts/AnonymousPro-Bold.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/AnonymousPro-Bold.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/AnonymousPro-BoldItalic.ttf.import b/third_party/Gut/addons/gut/fonts/AnonymousPro-BoldItalic.ttf.import
index 1f2f7fa..bdde207 100644
--- a/third_party/Gut/addons/gut/fonts/AnonymousPro-BoldItalic.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/AnonymousPro-BoldItalic.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/AnonymousPro-Italic.ttf.import b/third_party/Gut/addons/gut/fonts/AnonymousPro-Italic.ttf.import
index dab9eec..ce3e5b9 100644
--- a/third_party/Gut/addons/gut/fonts/AnonymousPro-Italic.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/AnonymousPro-Italic.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/AnonymousPro-Regular.ttf.import b/third_party/Gut/addons/gut/fonts/AnonymousPro-Regular.ttf.import
index 2978fb6..a567498 100644
--- a/third_party/Gut/addons/gut/fonts/AnonymousPro-Regular.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/AnonymousPro-Regular.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/CourierPrime-Bold.ttf.import b/third_party/Gut/addons/gut/fonts/CourierPrime-Bold.ttf.import
index 19295cd..cb05171 100644
--- a/third_party/Gut/addons/gut/fonts/CourierPrime-Bold.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/CourierPrime-Bold.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/CourierPrime-BoldItalic.ttf.import b/third_party/Gut/addons/gut/fonts/CourierPrime-BoldItalic.ttf.import
index fdd992b..0a9a7b7 100644
--- a/third_party/Gut/addons/gut/fonts/CourierPrime-BoldItalic.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/CourierPrime-BoldItalic.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/CourierPrime-Italic.ttf.import b/third_party/Gut/addons/gut/fonts/CourierPrime-Italic.ttf.import
index eb56e4d..89412fc 100644
--- a/third_party/Gut/addons/gut/fonts/CourierPrime-Italic.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/CourierPrime-Italic.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/CourierPrime-Regular.ttf.import b/third_party/Gut/addons/gut/fonts/CourierPrime-Regular.ttf.import
index 22430d6..9fde40b 100644
--- a/third_party/Gut/addons/gut/fonts/CourierPrime-Regular.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/CourierPrime-Regular.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/LobsterTwo-Bold.ttf.import b/third_party/Gut/addons/gut/fonts/LobsterTwo-Bold.ttf.import
index a4366cb..673d151 100644
--- a/third_party/Gut/addons/gut/fonts/LobsterTwo-Bold.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/LobsterTwo-Bold.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/LobsterTwo-BoldItalic.ttf.import b/third_party/Gut/addons/gut/fonts/LobsterTwo-BoldItalic.ttf.import
index 218d3bb..62048b0 100644
--- a/third_party/Gut/addons/gut/fonts/LobsterTwo-BoldItalic.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/LobsterTwo-BoldItalic.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/LobsterTwo-Italic.ttf.import b/third_party/Gut/addons/gut/fonts/LobsterTwo-Italic.ttf.import
index 4ab8c10..d3ca272 100644
--- a/third_party/Gut/addons/gut/fonts/LobsterTwo-Italic.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/LobsterTwo-Italic.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/fonts/LobsterTwo-Regular.ttf.import b/third_party/Gut/addons/gut/fonts/LobsterTwo-Regular.ttf.import
index 447eb47..9cc7542 100644
--- a/third_party/Gut/addons/gut/fonts/LobsterTwo-Regular.ttf.import
+++ b/third_party/Gut/addons/gut/fonts/LobsterTwo-Regular.ttf.import
@@ -23,7 +23,6 @@ allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
-keep_rounding_remainders=true
oversampling=0.0
Fallbacks=null
fallbacks=[]
diff --git a/third_party/Gut/addons/gut/gui/BottomPanelShortcuts.tscn b/third_party/Gut/addons/gut/gui/BottomPanelShortcuts.tscn
index 1525c32..802a63a 100644
--- a/third_party/Gut/addons/gut/gui/BottomPanelShortcuts.tscn
+++ b/third_party/Gut/addons/gut/gui/BottomPanelShortcuts.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://bsk32dh41b4gs"]
[ext_resource type="PackedScene" uid="uid://sfb1fw8j6ufu" path="res://addons/gut/gui/ShortcutButton.tscn" id="1"]
-[ext_resource type="Script" uid="uid://vppa8r8uq548" path="res://addons/gut/gui/BottomPanelShortcuts.gd" id="2"]
+[ext_resource type="Script" path="res://addons/gut/gui/BottomPanelShortcuts.gd" id="2"]
[node name="BottomPanelShortcuts" type="Popup"]
title = "Shortcuts"
diff --git a/third_party/Gut/addons/gut/gui/GutBottomPanel.tscn b/third_party/Gut/addons/gut/gui/GutBottomPanel.tscn
index 1eb020f..c2a2abb 100644
--- a/third_party/Gut/addons/gut/gui/GutBottomPanel.tscn
+++ b/third_party/Gut/addons/gut/gui/GutBottomPanel.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=10 format=3 uid="uid://b3bostcslstem"]
-[ext_resource type="Script" uid="uid://dtvnb0xatk0my" path="res://addons/gut/gui/GutBottomPanel.gd" id="1"]
+[ext_resource type="Script" path="res://addons/gut/gui/GutBottomPanel.gd" id="1"]
[ext_resource type="PackedScene" uid="uid://bsk32dh41b4gs" path="res://addons/gut/gui/BottomPanelShortcuts.tscn" id="2"]
[ext_resource type="PackedScene" uid="uid://0yunjxtaa8iw" path="res://addons/gut/gui/RunAtCursor.tscn" id="3"]
[ext_resource type="Texture2D" uid="uid://cr6tvdv0ve6cv" path="res://addons/gut/gui/play.png" id="4"]
@@ -9,7 +9,7 @@
[sub_resource type="Shortcut" id="9"]
-[sub_resource type="Image" id="Image_p7oqn"]
+[sub_resource type="Image" id="Image_mdv6o"]
data = {
"data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 93, 93, 41, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 44, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 44, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 94, 94, 234, 255, 95, 95, 43, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 94, 94, 234, 255, 95, 95, 43, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0),
"format": "RGBA8",
@@ -18,8 +18,8 @@ data = {
"width": 16
}
-[sub_resource type="ImageTexture" id="ImageTexture_umaha"]
-image = SubResource("Image_p7oqn")
+[sub_resource type="ImageTexture" id="ImageTexture_hchil"]
+image = SubResource("Image_mdv6o")
[node name="GutBottomPanel" type="Control"]
custom_minimum_size = Vector2(250, 250)
@@ -68,17 +68,20 @@ layout_mode = 2
[node name="RunResultsBtn" type="Button" parent="layout/ControlBar"]
layout_mode = 2
toggle_mode = true
-icon = SubResource("ImageTexture_umaha")
+button_pressed = true
+icon = SubResource("ImageTexture_hchil")
[node name="OutputBtn" type="Button" parent="layout/ControlBar"]
layout_mode = 2
toggle_mode = true
-icon = SubResource("ImageTexture_umaha")
+button_pressed = true
+icon = SubResource("ImageTexture_hchil")
[node name="Settings" type="Button" parent="layout/ControlBar"]
layout_mode = 2
toggle_mode = true
-icon = SubResource("ImageTexture_umaha")
+button_pressed = true
+icon = SubResource("ImageTexture_hchil")
[node name="Sep2" type="ColorRect" parent="layout/ControlBar"]
custom_minimum_size = Vector2(1, 2.08165e-12)
@@ -87,24 +90,12 @@ layout_mode = 2
[node name="Shortcuts" type="Button" parent="layout/ControlBar"]
layout_mode = 2
size_flags_vertical = 11
-icon = SubResource("ImageTexture_umaha")
+icon = SubResource("ImageTexture_hchil")
[node name="RSplit" type="HSplitContainer" parent="layout"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
-collapsed = true
-
-[node name="sc" type="ScrollContainer" parent="layout/RSplit"]
-visible = false
-custom_minimum_size = Vector2(500, 2.08165e-12)
-layout_mode = 2
-size_flags_vertical = 3
-
-[node name="Settings" type="VBoxContainer" parent="layout/RSplit/sc"]
-layout_mode = 2
-size_flags_horizontal = 3
-size_flags_vertical = 3
[node name="CResults" type="VBoxContainer" parent="layout/RSplit"]
layout_mode = 2
@@ -228,15 +219,24 @@ size_flags_horizontal = 3
size_flags_vertical = 3
[node name="RunResults" parent="layout/RSplit/CResults/TabBar" instance=ExtResource("5")]
-visible = false
+custom_minimum_size = Vector2(350, 0)
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="OutputText" parent="layout/RSplit/CResults/TabBar" instance=ExtResource("6")]
-visible = false
layout_mode = 2
+[node name="sc" type="ScrollContainer" parent="layout/RSplit"]
+custom_minimum_size = Vector2(500, 2.08165e-12)
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="Settings" type="VBoxContainer" parent="layout/RSplit/sc"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+
[node name="BottomPanelShortcuts" parent="." instance=ExtResource("2")]
visible = false
diff --git a/third_party/Gut/addons/gut/gui/MinGui.tscn b/third_party/Gut/addons/gut/gui/MinGui.tscn
index f347e5c..9db071e 100644
--- a/third_party/Gut/addons/gut/gui/MinGui.tscn
+++ b/third_party/Gut/addons/gut/gui/MinGui.tscn
@@ -2,7 +2,7 @@
[ext_resource type="Theme" uid="uid://cstkhwkpajvqu" path="res://addons/gut/gui/GutSceneTheme.tres" id="1_farmq"]
[ext_resource type="FontFile" uid="uid://bnh0lslf4yh87" path="res://addons/gut/fonts/CourierPrime-Regular.ttf" id="2_a2e2l"]
-[ext_resource type="Script" uid="uid://blvhsbnsvfyow" path="res://addons/gut/gui/gut_gui.gd" id="2_eokrf"]
+[ext_resource type="Script" path="res://addons/gut/gui/gut_gui.gd" id="2_eokrf"]
[ext_resource type="PackedScene" uid="uid://bvrqqgjpyouse" path="res://addons/gut/gui/ResizeHandle.tscn" id="4_xrhva"]
[node name="Min" type="Panel"]
diff --git a/third_party/Gut/addons/gut/gui/NormalGui.tscn b/third_party/Gut/addons/gut/gui/NormalGui.tscn
index 3b80c4c..e8c2621 100644
--- a/third_party/Gut/addons/gut/gui/NormalGui.tscn
+++ b/third_party/Gut/addons/gut/gui/NormalGui.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://duxblir3vu8x7"]
[ext_resource type="Theme" uid="uid://cstkhwkpajvqu" path="res://addons/gut/gui/GutSceneTheme.tres" id="1_5hlsm"]
-[ext_resource type="Script" uid="uid://blvhsbnsvfyow" path="res://addons/gut/gui/gut_gui.gd" id="2_fue6q"]
+[ext_resource type="Script" path="res://addons/gut/gui/gut_gui.gd" id="2_fue6q"]
[ext_resource type="FontFile" uid="uid://bnh0lslf4yh87" path="res://addons/gut/fonts/CourierPrime-Regular.ttf" id="2_u5uc1"]
[ext_resource type="PackedScene" uid="uid://bvrqqgjpyouse" path="res://addons/gut/gui/ResizeHandle.tscn" id="4_2r8a8"]
diff --git a/third_party/Gut/addons/gut/gui/ResizeHandle.tscn b/third_party/Gut/addons/gut/gui/ResizeHandle.tscn
index b13d9e5..2862ec9 100644
--- a/third_party/Gut/addons/gut/gui/ResizeHandle.tscn
+++ b/third_party/Gut/addons/gut/gui/ResizeHandle.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://bvrqqgjpyouse"]
-[ext_resource type="Script" uid="uid://duf6rfdqr6yoc" path="res://addons/gut/gui/ResizeHandle.gd" id="1_oi5ed"]
+[ext_resource type="Script" path="res://addons/gut/gui/ResizeHandle.gd" id="1_oi5ed"]
[node name="ResizeHandle" type="ColorRect"]
custom_minimum_size = Vector2(20, 20)
diff --git a/third_party/Gut/addons/gut/gui/ResultsTree.tscn b/third_party/Gut/addons/gut/gui/ResultsTree.tscn
index 26da3f0..ab6a1a5 100644
--- a/third_party/Gut/addons/gut/gui/ResultsTree.tscn
+++ b/third_party/Gut/addons/gut/gui/ResultsTree.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://dls5r5f6157nq"]
-[ext_resource type="Script" uid="uid://dehdhn78qv5tr" path="res://addons/gut/gui/ResultsTree.gd" id="1_b4uub"]
+[ext_resource type="Script" path="res://addons/gut/gui/ResultsTree.gd" id="1_b4uub"]
[node name="ResultsTree" type="VBoxContainer"]
custom_minimum_size = Vector2(10, 10)
diff --git a/third_party/Gut/addons/gut/gui/RunAtCursor.tscn b/third_party/Gut/addons/gut/gui/RunAtCursor.tscn
index 7605e0a..bba1dac 100644
--- a/third_party/Gut/addons/gut/gui/RunAtCursor.tscn
+++ b/third_party/Gut/addons/gut/gui/RunAtCursor.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://0yunjxtaa8iw"]
-[ext_resource type="Script" uid="uid://c4gmgdl1xwflw" path="res://addons/gut/gui/RunAtCursor.gd" id="1"]
+[ext_resource type="Script" path="res://addons/gut/gui/RunAtCursor.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://cr6tvdv0ve6cv" path="res://addons/gut/gui/play.png" id="2"]
[ext_resource type="Texture2D" uid="uid://6wra5rxmfsrl" path="res://addons/gut/gui/arrow.png" id="3"]
diff --git a/third_party/Gut/addons/gut/gui/RunResults.tscn b/third_party/Gut/addons/gut/gui/RunResults.tscn
index 112fe5a..f5568ee 100644
--- a/third_party/Gut/addons/gut/gui/RunResults.tscn
+++ b/third_party/Gut/addons/gut/gui/RunResults.tscn
@@ -1,22 +1,22 @@
[gd_scene load_steps=5 format=3 uid="uid://4gyyn12um08h"]
-[ext_resource type="Script" uid="uid://chnko3073tkcv" path="res://addons/gut/gui/RunResults.gd" id="1"]
+[ext_resource type="Script" path="res://addons/gut/gui/RunResults.gd" id="1"]
[ext_resource type="PackedScene" uid="uid://dls5r5f6157nq" path="res://addons/gut/gui/ResultsTree.tscn" id="2_o808v"]
-[sub_resource type="Image" id="Image_47dks"]
+[sub_resource type="Image" id="Image_wypdf"]
data = {
-"data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 231, 255, 93, 93, 55, 255, 97, 97, 58, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 93, 93, 41, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 97, 97, 42, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 98, 98, 47, 255, 97, 97, 42, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 93, 93, 233, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 94, 94, 46, 255, 93, 93, 236, 255, 93, 93, 233, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0),
+"data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 93, 93, 41, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 44, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 44, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 94, 94, 234, 255, 95, 95, 43, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 94, 94, 234, 255, 95, 95, 43, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0),
"format": "RGBA8",
"height": 16,
"mipmaps": false,
"width": 16
}
-[sub_resource type="ImageTexture" id="ImageTexture_x655i"]
-image = SubResource("Image_47dks")
+[sub_resource type="ImageTexture" id="ImageTexture_1a2bj"]
+image = SubResource("Image_wypdf")
[node name="RunResults" type="Control"]
-custom_minimum_size = Vector2(345, 0)
+custom_minimum_size = Vector2(350, 0)
layout_mode = 3
anchors_preset = 0
offset_right = 709.0
@@ -34,11 +34,11 @@ size_flags_horizontal = 0
[node name="Expand" type="Button" parent="VBox/Toolbar"]
layout_mode = 2
-icon = SubResource("ImageTexture_x655i")
+icon = SubResource("ImageTexture_1a2bj")
[node name="Collapse" type="Button" parent="VBox/Toolbar"]
layout_mode = 2
-icon = SubResource("ImageTexture_x655i")
+icon = SubResource("ImageTexture_1a2bj")
[node name="Sep" type="ColorRect" parent="VBox/Toolbar"]
custom_minimum_size = Vector2(2, 0)
@@ -50,11 +50,11 @@ text = "All:"
[node name="ExpandAll" type="Button" parent="VBox/Toolbar"]
layout_mode = 2
-icon = SubResource("ImageTexture_x655i")
+icon = SubResource("ImageTexture_1a2bj")
[node name="CollapseAll" type="Button" parent="VBox/Toolbar"]
layout_mode = 2
-icon = SubResource("ImageTexture_x655i")
+icon = SubResource("ImageTexture_1a2bj")
[node name="Sep2" type="ColorRect" parent="VBox/Toolbar"]
custom_minimum_size = Vector2(2, 0)
@@ -77,13 +77,13 @@ text = "Sync:"
layout_mode = 2
toggle_mode = true
button_pressed = true
-icon = SubResource("ImageTexture_x655i")
+icon = SubResource("ImageTexture_1a2bj")
[node name="ScrollOutput" type="Button" parent="VBox/Toolbar"]
layout_mode = 2
toggle_mode = true
button_pressed = true
-icon = SubResource("ImageTexture_x655i")
+icon = SubResource("ImageTexture_1a2bj")
[node name="Output" type="Panel" parent="VBox"]
self_modulate = Color(1, 1, 1, 0.541176)
diff --git a/third_party/Gut/addons/gut/gui/ShortcutButton.tscn b/third_party/Gut/addons/gut/gui/ShortcutButton.tscn
index 896854a..8a18edc 100644
--- a/third_party/Gut/addons/gut/gui/ShortcutButton.tscn
+++ b/third_party/Gut/addons/gut/gui/ShortcutButton.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://sfb1fw8j6ufu"]
-[ext_resource type="Script" uid="uid://k6hvvpekp0xw" path="res://addons/gut/gui/ShortcutButton.gd" id="1"]
+[ext_resource type="Script" path="res://addons/gut/gui/ShortcutButton.gd" id="1"]
[node name="ShortcutButton" type="Control"]
custom_minimum_size = Vector2(210, 30)
TortoiseGit のパッチ情報の dirty 表記に関する推測
前回の記事で、TortoiseGit のコミットのダイアログで、差分のあるサブモジュールのフォルダパスにチェックをいれて、パッチを表示すると、該当するサブモジュールのハッシュ値 (SHA) のあとに – dirty という表記がありました。
diff --git a/third_party/Gut b/third_party/Gut
--- a/third_party/Gut
+++ b/third_party/Gut
@@ -1 +1 @@
-Subproject commit 7929230ab145ff400e44380454646cbc04bf1ac0
+Subproject commit 7929230ab145ff400e44380454646cbc04bf1ac0-dirtyしかし、先ほどのサブモジュールの差分をファイル出力した patch.diff には dirty 表記はありません。また、git submodule status コマンドでも、パッチと同じハッシュ値 (SHA-1) は表示されますが dirty は表示されません。
G:\Dev\Godot4GD\SakuraCrowd\SakuraCrowdGodotLib>git submodule status
7929230ab145ff400e44380454646cbc04bf1ac0 third_party/Gut (v9.4.0-7-g7929230)With no arguments, shows the status of existing submodules. Several subcommands are available to perform operations on the submodules.
引数を指定しないと、既存のサブモジュールのステータスが表示されます。サブモジュール上で操作を実行するために、いくつかのサブコマンドを使用できます。
status [–cached] [–recursive] [–] […]
Show the status of the submodules. This will print the SHA-1 of the currently checked out commit for each submodule, along with the submodule path and the output of git describe for the SHA-1. Each SHA-1 will possibly be prefixed with – if the submodule is not initialized, + if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing repository and U if the submodule has merge conflicts.サブモジュールのステータスを表示します。これにより、各サブモジュールの現在チェックアウトされているコミットの SHA-1 が、サブモジュールのパスと SHA-1 の git description の出力とともに出力されます。各 SHA-1 には、サブモジュールが初期化されていない場合は -、現在チェックアウトされているサブモジュールのコミットが含まれるリポジトリのインデックスにある SHA-1 と一致しない場合は +、サブモジュールにマージ競合がある場合は U というプレフィックスが付けられる可能性があります。
Git – git-submodule Documentation と Google 翻訳
このことから、git-status コマンドで確認した、ステージングされない変更点としてサブモジュールのフォルダ third_party/Gut について、変更があることを TortoiseGit がパッチ情報で、差分のあるパスとして明記するために、ハッシュ値 (SHA-1) のあとに dirty と付け加えたのかもしれません。
まとめ
今回は、Git でバージョン管理するリポジトリ内に、外部のリポジトリをサブモジュールとして配置して、そのサブモジュールを変更した際の、サブモジュールだけの差分（パッチ）をファイル出力するコマンド例を紹介しました。
また、エクスプローラで操作できる Git クライアントソフト TortoiseGit のコミットのダイアログに表示されたサブモジュールの差分（パッチ）の情報の dirty 表記に関する推測も記述しました。
参照サイト Thank You!
- Git
- Git – git-status Documentation
- Git – サブモジュール
- Git – git-submodule Documentation
- Git – git-diff Documentation
- TortoiseGit – Windows Shell Interface to Git
- TortoiseGit – TortoiseGit – Documentation – TortoiseGit – Windows Shell Interface to Git
- Committing Your Changes To The Repository – TortoiseGit – Documentation – TortoiseGit – Windows Shell Interface to Git
記事一覧 → Compota-Soft-Press
コメント