From 3cfdae41165828f9ecb3f3497efd37651a6193d3 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 12 Feb 2023 18:00:45 +1100
Subject: [PATCH] migrate submodule reset test

---
 pkg/integration/tests/submodule/enter.go      |  13 +++
 pkg/integration/tests/submodule/reset.go      | 105 ++++++++++++++++++
 pkg/integration/tests/tests.go                |   1 +
 .../submoduleReset/config/config.yml          |   6 -
 .../submoduleReset/expected/other_repo/HEAD   |   1 -
 .../submoduleReset/expected/other_repo/config |   8 --
 .../expected/other_repo/description           |   1 -
 .../expected/other_repo/info/exclude          |   7 --
 .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes
 .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes
 .../42/530e986dbb65877ed8d61ca0c816e425e5c62e | Bin 150 -> 0 bytes
 .../a5/0a5125768001a3ea263ffb7cafbc421a508153 |   2 -
 .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes
 .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes
 .../expected/other_repo/packed-refs           |   2 -
 .../expected/repo/.git_keep/COMMIT_EDITMSG    |   1 -
 .../expected/repo/.git_keep/FETCH_HEAD        |   0
 .../expected/repo/.git_keep/HEAD              |   1 -
 .../expected/repo/.git_keep/config            |  13 ---
 .../expected/repo/.git_keep/description       |   1 -
 .../expected/repo/.git_keep/index             | Bin 369 -> 0 bytes
 .../expected/repo/.git_keep/info/exclude      |   7 --
 .../expected/repo/.git_keep/logs/HEAD         |   3 -
 .../repo/.git_keep/logs/refs/heads/master     |   3 -
 .../repo/.git_keep/modules/other_repo/HEAD    |   1 -
 .../.git_keep/modules/other_repo/ORIG_HEAD    |   1 -
 .../repo/.git_keep/modules/other_repo/config  |  14 ---
 .../.git_keep/modules/other_repo/description  |   1 -
 .../repo/.git_keep/modules/other_repo/index   | Bin 209 -> 0 bytes
 .../.git_keep/modules/other_repo/info/exclude |   7 --
 .../.git_keep/modules/other_repo/logs/HEAD    |   5 -
 .../modules/other_repo/logs/refs/heads/master |   2 -
 .../other_repo/logs/refs/remotes/origin/HEAD  |   1 -
 .../modules/other_repo/logs/refs/stash        |   1 -
 .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes
 .../17/a177705e91137f8c55965c9c8818dd55e97c89 |   2 -
 .../17/defcd0e1f9ad96542aa66845e53cb46c91c30d | Bin 86 -> 0 bytes
 .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes
 .../42/530e986dbb65877ed8d61ca0c816e425e5c62e | Bin 150 -> 0 bytes
 .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes
 .../5a/d28e22767f979da2c198dc6c1003b25964e3da | Bin 20 -> 0 bytes
 .../87/4e570cb4ea7387ba59054b315aa584038cacea |   2 -
 .../a5/0a5125768001a3ea263ffb7cafbc421a508153 |   2 -
 .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes
 .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes
 .../d2/2afbf8d80bbd74bcd87cae8a17a0315cfc915b | Bin 180 -> 0 bytes
 .../.git_keep/modules/other_repo/packed-refs  |   2 -
 .../modules/other_repo/refs/heads/master      |   1 -
 .../other_repo/refs/remotes/origin/HEAD       |   1 -
 .../.git_keep/modules/other_repo/refs/stash   |   1 -
 .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes
 .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes
 .../2b/864257bf2d49adbad8785540d85030a60852ff | Bin 62 -> 0 bytes
 .../2e/eb2c1e6451d1318b506eecddf936b59a5f32b8 | Bin 150 -> 0 bytes
 .../42/530e986dbb65877ed8d61ca0c816e425e5c62e | Bin 150 -> 0 bytes
 .../9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440 | Bin 152 -> 0 bytes
 .../a5/0a5125768001a3ea263ffb7cafbc421a508153 |   2 -
 .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes
 .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes
 .../expected/repo/.git_keep/refs/heads/master |   1 -
 .../expected/repo/.gitmodules_keep            |   3 -
 .../submoduleReset/expected/repo/myfile1      |   1 -
 .../submoduleReset/expected/repo/myfile2      |   1 -
 .../expected/repo/other_repo/.git_keep        |   1 -
 .../expected/repo/other_repo/myfile1          |   1 -
 .../expected/repo/other_repo/myfile2          |   1 -
 .../integration/submoduleReset/recording.json |   1 -
 test/integration/submoduleReset/setup.sh      |  27 -----
 test/integration/submoduleReset/test.json     |   4 -
 69 files changed, 119 insertions(+), 143 deletions(-)
 create mode 100644 pkg/integration/tests/submodule/reset.go
 delete mode 100644 test/integration/submoduleReset/config/config.yml
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/HEAD
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/config
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/description
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/info/exclude
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
 delete mode 100644 test/integration/submoduleReset/expected/other_repo/packed-refs
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/COMMIT_EDITMSG
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/FETCH_HEAD
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/HEAD
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/config
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/description
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/index
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/info/exclude
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/logs/HEAD
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/logs/refs/heads/master
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/HEAD
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/config
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/description
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/index
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/info/exclude
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/HEAD
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/stash
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/a177705e91137f8c55965c9c8818dd55e97c89
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/defcd0e1f9ad96542aa66845e53cb46c91c30d
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/87/4e570cb4ea7387ba59054b315aa584038cacea
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/d2/2afbf8d80bbd74bcd87cae8a17a0315cfc915b
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/packed-refs
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/heads/master
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/stash
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
 delete mode 100644 test/integration/submoduleReset/expected/repo/.git_keep/refs/heads/master
 delete mode 100644 test/integration/submoduleReset/expected/repo/.gitmodules_keep
 delete mode 100644 test/integration/submoduleReset/expected/repo/myfile1
 delete mode 100644 test/integration/submoduleReset/expected/repo/myfile2
 delete mode 100644 test/integration/submoduleReset/expected/repo/other_repo/.git_keep
 delete mode 100644 test/integration/submoduleReset/expected/repo/other_repo/myfile1
 delete mode 100644 test/integration/submoduleReset/expected/repo/other_repo/myfile2
 delete mode 100644 test/integration/submoduleReset/recording.json
 delete mode 100644 test/integration/submoduleReset/setup.sh
 delete mode 100644 test/integration/submoduleReset/test.json

diff --git a/pkg/integration/tests/submodule/enter.go b/pkg/integration/tests/submodule/enter.go
index c97e55a46..8dbbb73b4 100644
--- a/pkg/integration/tests/submodule/enter.go
+++ b/pkg/integration/tests/submodule/enter.go
@@ -26,6 +26,15 @@ var Enter = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.Commit("add submodule")
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		assertInParentRepo := func() {
+			t.Views().Status().Content(Contains("repo"))
+		}
+		assertInSubmodule := func() {
+			t.Views().Status().Content(Contains("my_submodule"))
+		}
+
+		assertInParentRepo()
+
 		t.Views().Submodules().Focus().
 			Lines(
 				Contains("my_submodule").IsSelected(),
@@ -33,6 +42,8 @@ var Enter = NewIntegrationTest(NewIntegrationTestArgs{
 			// enter the submodule
 			PressEnter()
 
+		assertInSubmodule()
+
 		t.Views().Files().IsFocused().
 			Press("e").
 			Tap(func() {
@@ -41,6 +52,8 @@ var Enter = NewIntegrationTest(NewIntegrationTestArgs{
 			// return to the parent repo
 			PressEscape()
 
+		assertInParentRepo()
+
 		t.Views().Submodules().IsFocused()
 
 		// we see the new commit in the submodule is ready to be staged in the parent repo
diff --git a/pkg/integration/tests/submodule/reset.go b/pkg/integration/tests/submodule/reset.go
new file mode 100644
index 000000000..474780f1b
--- /dev/null
+++ b/pkg/integration/tests/submodule/reset.go
@@ -0,0 +1,105 @@
+package submodule
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var Reset = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Enter a submodule, create a commit and stage some changes, then reset the submodule from back in the parent repo. This test captures functionality around getting a dirty submodule out of your files panel.",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig: func(cfg *config.AppConfig) {
+		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+			{
+				Key:     "e",
+				Context: "files",
+				Command: "git commit --allow-empty -m \"empty commit\" && echo \"my_file content\" > my_file",
+			},
+		}
+	},
+	SetupRepo: func(shell *Shell) {
+		shell.EmptyCommit("first commit")
+		shell.RunCommand("git clone --bare . ../other_repo")
+		shell.RunCommand("git submodule add ../other_repo my_submodule")
+		shell.GitAddAll()
+		shell.Commit("add submodule")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		assertInParentRepo := func() {
+			t.Views().Status().Content(Contains("repo"))
+		}
+		assertInSubmodule := func() {
+			t.Views().Status().Content(Contains("my_submodule"))
+		}
+
+		assertInParentRepo()
+
+		t.Views().Submodules().Focus().
+			Lines(
+				Contains("my_submodule").IsSelected(),
+			).
+			// enter the submodule
+			PressEnter()
+
+		assertInSubmodule()
+
+		t.Views().Status().Content(Contains("my_submodule"))
+
+		t.Views().Files().IsFocused().
+			Press("e").
+			Tap(func() {
+				t.Views().Commits().Content(Contains("empty commit"))
+				t.Views().Files().Content(Contains("my_file"))
+			}).
+			Lines(
+				Contains("my_file").IsSelected(),
+			).
+			// stage my_file
+			PressPrimaryAction().
+			// return to the parent repo
+			PressEscape()
+
+		assertInParentRepo()
+
+		t.Views().Submodules().IsFocused()
+
+		t.Views().Main().Content(Contains("Submodule my_submodule contains modified content"))
+
+		t.Views().Files().Focus().
+			Lines(
+				MatchesRegexp(` M.*my_submodule \(submodule\)`).IsSelected(),
+			).
+			Press(keys.Universal.Remove).
+			Tap(func() {
+				t.ExpectPopup().Menu().Title(Equals("my_submodule")).Select(Contains("stash uncommitted submodule changes and update")).Confirm()
+			}).
+			IsEmpty()
+
+		t.Views().Submodules().Focus().
+			PressEnter()
+
+		assertInSubmodule()
+
+		// submodule has been hard reset to the commit the parent repo specifies
+		t.Views().Branches().Lines(
+			Contains("HEAD detached").IsSelected(),
+			Contains("master"),
+		)
+
+		// empty commit is gone
+		t.Views().Commits().Lines(
+			Contains("first commit").IsSelected(),
+		)
+
+		// the staged change has been stashed
+		t.Views().Files().IsEmpty()
+
+		t.Views().Stash().Focus().
+			Lines(
+				Contains("WIP on master").IsSelected(),
+			)
+
+		t.Views().Main().Content(Contains("my_file content"))
+	},
+})
diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go
index b7e74114c..332d7e08f 100644
--- a/pkg/integration/tests/tests.go
+++ b/pkg/integration/tests/tests.go
@@ -79,6 +79,7 @@ var tests = []*components.IntegrationTest{
 	submodule.Add,
 	submodule.Remove,
 	submodule.Enter,
+	submodule.Reset,
 }
 
 func GetTests() []*components.IntegrationTest {
diff --git a/test/integration/submoduleReset/config/config.yml b/test/integration/submoduleReset/config/config.yml
deleted file mode 100644
index 991cda34b..000000000
--- a/test/integration/submoduleReset/config/config.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-disableStartupPopups: true
-customCommands:
-  - key: 'N'
-    description: 'Add file'
-    context: 'files'
-    command: 'echo "haha" > output.txt'
diff --git a/test/integration/submoduleReset/expected/other_repo/HEAD b/test/integration/submoduleReset/expected/other_repo/HEAD
deleted file mode 100644
index cb089cd89..000000000
--- a/test/integration/submoduleReset/expected/other_repo/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-ref: refs/heads/master
diff --git a/test/integration/submoduleReset/expected/other_repo/config b/test/integration/submoduleReset/expected/other_repo/config
deleted file mode 100644
index 662e16b6c..000000000
--- a/test/integration/submoduleReset/expected/other_repo/config
+++ /dev/null
@@ -1,8 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = true
-	ignorecase = true
-	precomposeunicode = true
-[remote "origin"]
-	url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/./repo
diff --git a/test/integration/submoduleReset/expected/other_repo/description b/test/integration/submoduleReset/expected/other_repo/description
deleted file mode 100644
index 498b267a8..000000000
--- a/test/integration/submoduleReset/expected/other_repo/description
+++ /dev/null
@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/submoduleReset/expected/other_repo/info/exclude b/test/integration/submoduleReset/expected/other_repo/info/exclude
deleted file mode 100644
index 8e9f2071f..000000000
--- a/test/integration/submoduleReset/expected/other_repo/info/exclude
+++ /dev/null
@@ -1,7 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-.DS_Store
diff --git a/test/integration/submoduleReset/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleReset/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
deleted file mode 100644
index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 52
zcmb<m)YkO!4K*-JH83$SFg6T4vDWAG8Bf!ch+WS=#$UZ69k1lHxZ=}XJ(h~CCGo5b
Ijy?h}0Qz4PZU6uP

diff --git a/test/integration/submoduleReset/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleReset/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
deleted file mode 100644
index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21
ccmb<m^geacKgb|i!&6t!@DUS(>~ZE#08nZNMgRZ+

diff --git a/test/integration/submoduleReset/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleReset/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e
deleted file mode 100644
index 64d20cb1ea175608a3e05acff298a97ed57eb7b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmV;H0BQet0gaA93c@fDMP26<*$Xn6B$Eb2gsyswNjrlDV@rvkw>L*{``_d7=dISY
zS(n499U_*K4~}D2SQZh@l!dYu@-!gPf>=N?I5ImQ@@keNaC8_G4FHb4Fp^g-X=W{R
zz}|wvMQ`}s9@}BZ$zI3lE+4M@Q!evXZ?@x*GNzdA861G=Yd_WGPu<k7u1`Vp1Ej$@
E=Z{%N+5i9m

diff --git a/test/integration/submoduleReset/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleReset/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153
deleted file mode 100644
index 5dd5f3236..000000000
--- a/test/integration/submoduleReset/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��M
-�0@�s��J&N������	I�޾���/�Z�H����R��%d"��r@�X<-4dG��5�?���fxN�(_��&������6�]���פ˟\ճ����
5,�
\ No newline at end of file
diff --git a/test/integration/submoduleReset/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleReset/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
deleted file mode 100644
index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21
ccmb<m^geacKgb|i!&6t!@Cg%x>`~^A08nuUMF0Q*

diff --git a/test/integration/submoduleReset/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleReset/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
deleted file mode 100644
index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77
zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%t<w5Si0x&U)9tbUm`-Ic=DYt1bDS{
jUqw-3#2~@*!>B=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg

diff --git a/test/integration/submoduleReset/expected/other_repo/packed-refs b/test/integration/submoduleReset/expected/other_repo/packed-refs
deleted file mode 100644
index 62f6568b2..000000000
--- a/test/integration/submoduleReset/expected/other_repo/packed-refs
+++ /dev/null
@@ -1,2 +0,0 @@
-# pack-refs with: peeled fully-peeled sorted 
-42530e986dbb65877ed8d61ca0c816e425e5c62e refs/heads/master
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/submoduleReset/expected/repo/.git_keep/COMMIT_EDITMSG
deleted file mode 100644
index ad3cdfdd1..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/COMMIT_EDITMSG
+++ /dev/null
@@ -1 +0,0 @@
-add submodule
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/FETCH_HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/FETCH_HEAD
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/HEAD
deleted file mode 100644
index cb089cd89..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-ref: refs/heads/master
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/config b/test/integration/submoduleReset/expected/repo/.git_keep/config
deleted file mode 100644
index ff4ef7e1c..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/config
+++ /dev/null
@@ -1,13 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-	ignorecase = true
-	precomposeunicode = true
-[user]
-	email = CI@example.com
-	name = CI
-[submodule "other_repo"]
-	url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/other_repo
-	active = true
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/description b/test/integration/submoduleReset/expected/repo/.git_keep/description
deleted file mode 100644
index 498b267a8..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/description
+++ /dev/null
@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/index b/test/integration/submoduleReset/expected/repo/.git_keep/index
deleted file mode 100644
index 479039f965c9f3579255cef90af6c44864122ed8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 369
zcmZ?q402{*U|<4bmL&Vr-<V$byMyUx`^^{`7+9I+{t#neXk5a;!1xuYMg)i*wcDJ+
z_v?DD-F2fP)Zs>e!7`4Z{|wxE>6s<D`6;D2sl`A=AOJMytI^*Gkhx$QV&3->H1pV&
z?s@!IHTA}qh|nmWe5VTmUM<~M8Q60x(=u~X4WZ^3KU~WJG6zIM&FMlnM}p^vQG?RH
zb1zpd3a{#Kd8IwyLLFv~5yYHtOkA21!Ttl%P;<^QFgyUt!u_|vDVT3Y?(Wp~x*OMI
z7Mu`!qWbih9s^f?Nk(c>d{JsaK2R|jgao;|0vVDFCJF{zdarflQUWg;b_e9Wx%<;>
f>#TUA9ftBt^A>VEd3K5IXF$ujji;|kMu`FdoHTt0

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/info/exclude b/test/integration/submoduleReset/expected/repo/.git_keep/info/exclude
deleted file mode 100644
index 8e9f2071f..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/info/exclude
+++ /dev/null
@@ -1,7 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-.DS_Store
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/logs/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/logs/HEAD
deleted file mode 100644
index d10fa88d0..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/logs/HEAD
+++ /dev/null
@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 a50a5125768001a3ea263ffb7cafbc421a508153 CI <CI@example.com> 1534792759 +0100	commit (initial): myfile1
-a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI <CI@example.com> 1534792759 +0100	commit: myfile2
-42530e986dbb65877ed8d61ca0c816e425e5c62e 9d10a5a0a21eb2cfdb6206f474ed57fd5cd51440 CI <CI@example.com> 1534792759 +0100	commit: add submodule
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/submoduleReset/expected/repo/.git_keep/logs/refs/heads/master
deleted file mode 100644
index d10fa88d0..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/logs/refs/heads/master
+++ /dev/null
@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 a50a5125768001a3ea263ffb7cafbc421a508153 CI <CI@example.com> 1534792759 +0100	commit (initial): myfile1
-a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI <CI@example.com> 1534792759 +0100	commit: myfile2
-42530e986dbb65877ed8d61ca0c816e425e5c62e 9d10a5a0a21eb2cfdb6206f474ed57fd5cd51440 CI <CI@example.com> 1534792759 +0100	commit: add submodule
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/HEAD
deleted file mode 100644
index a70ff80c0..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-42530e986dbb65877ed8d61ca0c816e425e5c62e
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD
deleted file mode 100644
index ab99dc85b..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD
+++ /dev/null
@@ -1 +0,0 @@
-a50a5125768001a3ea263ffb7cafbc421a508153
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/config b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/config
deleted file mode 100644
index 57da72856..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/config
+++ /dev/null
@@ -1,14 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-	ignorecase = true
-	precomposeunicode = true
-	worktree = ../../../other_repo
-[remote "origin"]
-	url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/other_repo
-	fetch = +refs/heads/*:refs/remotes/origin/*
-[branch "master"]
-	remote = origin
-	merge = refs/heads/master
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/description b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/description
deleted file mode 100644
index 498b267a8..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/description
+++ /dev/null
@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/index b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/index
deleted file mode 100644
index e02fb97112edcba96fb5851e08e7d1ce953662f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 209
zcmZ?q402{*U|<5_B>U6fm^iL9!DvPX23DrIKLi;V8kaCIFn$H95dmVhrF$O#RZYF|
zB_cG6C*SEpfLBZRRR;Fl%CyX!R70SGB>OW=It#X4fzeQNO3}@c;Q3+HptSGY%T<fQ
ztNL4BY0tM%hnZspG$$m;)fGrdG8icsa4k2Hiu`c*-OtQt^S7BbrCrkIR}s@=Hw%}#
U`*l-#qrclF#aDlwK9p?&06XtU9RL6T

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/info/exclude b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/info/exclude
deleted file mode 100644
index 8e9f2071f..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/info/exclude
+++ /dev/null
@@ -1,7 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-.DS_Store
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/HEAD
deleted file mode 100644
index a5e1c88ec..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/HEAD
+++ /dev/null
@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield <jessedduffield@gmail.com> 1534792759 +0100	clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/other_repo
-42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield <jessedduffield@gmail.com> 1648348154 +1100	rebase -i (start): checkout a50a5125768001a3ea263ffb7cafbc421a508153
-a50a5125768001a3ea263ffb7cafbc421a508153 a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield <jessedduffield@gmail.com> 1648348154 +1100	rebase -i (finish): returning to refs/heads/master
-a50a5125768001a3ea263ffb7cafbc421a508153 a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield <jessedduffield@gmail.com> 1648348162 +1100	reset: moving to HEAD
-a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield <jessedduffield@gmail.com> 1648348162 +1100	checkout: moving from master to 42530e986dbb65877ed8d61ca0c816e425e5c62e
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master
deleted file mode 100644
index 07a1588f3..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master
+++ /dev/null
@@ -1,2 +0,0 @@
-0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield <jessedduffield@gmail.com> 1534792759 +0100	clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/other_repo
-42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield <jessedduffield@gmail.com> 1648348154 +1100	rebase -i (finish): refs/heads/master onto a50a5125768001a3ea263ffb7cafbc421a508153
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD
deleted file mode 100644
index ac58921d8..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield <jessedduffield@gmail.com> 1534792759 +0100	clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/other_repo
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/stash b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/stash
deleted file mode 100644
index 455599518..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/stash
+++ /dev/null
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 874e570cb4ea7387ba59054b315aa584038cacea Jesse Duffield <jessedduffield@gmail.com> 1648348162 +1100	WIP on master: a50a512 myfile1
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
deleted file mode 100644
index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 52
zcmb<m)YkO!4K*-JH83$SFg6T4vDWAG8Bf!ch+WS=#$UZ69k1lHxZ=}XJ(h~CCGo5b
Ijy?h}0Qz4PZU6uP

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/a177705e91137f8c55965c9c8818dd55e97c89 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/a177705e91137f8c55965c9c8818dd55e97c89
deleted file mode 100644
index 20341dac7..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/a177705e91137f8c55965c9c8818dd55e97c89
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��A� E]s�ٛ��Pc�W�b�A�R�B��6�.�������;hmv}f�N�,��-����l�'���K������3ܹ5�ےR�1���q�?�>
-��j�����հWJJ�����_�L}���)�ܠNP�����d����&%���J�
\ No newline at end of file
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/defcd0e1f9ad96542aa66845e53cb46c91c30d b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/defcd0e1f9ad96542aa66845e53cb46c91c30d
deleted file mode 100644
index a908456d800f1b32337b13ce6b0eb16ae48c82cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86
zcmV-c0IC0Y0V^p=O;s>AW-v4`Ff%bx$gNDv%t<w5Si0x&U)9tbUm`-Ic=DYt1bDS{
sUxg~kFD)r3Ezv8fC}D`Y)TdNdKYi|^gEQ{r2rzGoOnH0@0M9}o|JINsP5=M^

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
deleted file mode 100644
index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21
ccmb<m^geacKgb|i!&6t!@DUS(>~ZE#08nZNMgRZ+

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e
deleted file mode 100644
index 64d20cb1ea175608a3e05acff298a97ed57eb7b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmV;H0BQet0gaA93c@fDMP26<*$Xn6B$Eb2gsyswNjrlDV@rvkw>L*{``_d7=dISY
zS(n499U_*K4~}D2SQZh@l!dYu@-!gPf>=N?I5ImQ@@keNaC8_G4FHb4Fp^g-X=W{R
zz}|wvMQ`}s9@}BZ$zI3lE+4M@Q!evXZ?@x*GNzdA861G=Yd_WGPu<k7u1`Vp1Ej$@
E=Z{%N+5i9m

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
deleted file mode 100644
index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15
Wcmb<m)YkO!4K+w$VBpeWVgvvgJ_3UP

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da
deleted file mode 100644
index a49384ff604c8486178beafbf3cf566283daef9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20
bcmb<m^geacKgb~UgvS|=Crk{I!psu^RbU5L

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/87/4e570cb4ea7387ba59054b315aa584038cacea b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/87/4e570cb4ea7387ba59054b315aa584038cacea
deleted file mode 100644
index 27b770b53..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/87/4e570cb4ea7387ba59054b315aa584038cacea
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��1O�0���+�#�8�!���c;����}�� �~
��}:['�L���o���AQk�ޠ��c��s���Qj�2�D��ov>�g��%����8��Z-­J
-�
�W^C�A#%_��TE��F�}��/`��݅R�G
bi$��+�H{P�Ɓ/�i�ܫ����Kk���>��~�Xx��d]�D1��n
��ۧ8�_%��˛[�n�7�_�q�w�f��Wn�
\ No newline at end of file
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153
deleted file mode 100644
index 5dd5f3236..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��M
-�0@�s��J&N������	I�޾���/�Z�H����R��%d"��r@�X<-4dG��5�?���fxN�(_��&������6�]���פ˟\ճ����
5,�
\ No newline at end of file
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
deleted file mode 100644
index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21
ccmb<m^geacKgb|i!&6t!@Cg%x>`~^A08nuUMF0Q*

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
deleted file mode 100644
index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77
zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%t<w5Si0x&U)9tbUm`-Ic=DYt1bDS{
jUqw-3#2~@*!>B=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/d2/2afbf8d80bbd74bcd87cae8a17a0315cfc915b b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/d2/2afbf8d80bbd74bcd87cae8a17a0315cfc915b
deleted file mode 100644
index 7b37fd58d5295a81a2cf8007ebcf3b00b0e2aabd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmV;l089UP0i};kYQr!Pg|pTvW*;aT{fy-hN)}z^7Gr7DDp+>06=-i?1(FkV`8^&V
z@5Qy&(!h{Cv`qwXNRngHf_daLl6QugC^#?P#>r6}F<PC}H*c~uV6WMu@dE{|k*#o7
z<vb0M^Aw%IUI^%|;(PmAH@M2a3w+#jE;1)L-yWROlP{l@%lsDC`VL4gSQn5C91*ov
iJ?&GQ{7a(BlH>>01uE~|b$UI3`kTuvsQv)=$5d8Re^yrj

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/packed-refs b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/packed-refs
deleted file mode 100644
index 2991aad64..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/packed-refs
+++ /dev/null
@@ -1,2 +0,0 @@
-# pack-refs with: peeled fully-peeled sorted 
-42530e986dbb65877ed8d61ca0c816e425e5c62e refs/remotes/origin/master
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/heads/master b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/heads/master
deleted file mode 100644
index ab99dc85b..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/heads/master
+++ /dev/null
@@ -1 +0,0 @@
-a50a5125768001a3ea263ffb7cafbc421a508153
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD
deleted file mode 100644
index 6efe28fff..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-ref: refs/remotes/origin/master
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/stash b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/stash
deleted file mode 100644
index 5d3437a08..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/stash
+++ /dev/null
@@ -1 +0,0 @@
-874e570cb4ea7387ba59054b315aa584038cacea
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
deleted file mode 100644
index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 52
zcmb<m)YkO!4K*-JH83$SFg6T4vDWAG8Bf!ch+WS=#$UZ69k1lHxZ=}XJ(h~CCGo5b
Ijy?h}0Qz4PZU6uP

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
deleted file mode 100644
index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21
ccmb<m^geacKgb|i!&6t!@DUS(>~ZE#08nZNMgRZ+

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff b/test/integration/submoduleReset/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff
deleted file mode 100644
index 5bfb0cefc3370964e04c1d101231d7a71600af5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 62
zcmV-E0Kxxw0ZYosPf{>5Wr!{=P0GzrDa}b$P|7dKNG*ylN-fA&isj-gNG!=vuvI_^
Ua&eXx<p4$W^z@Mg0gz4@aV*&yD*ylh

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8
deleted file mode 100644
index acdda888bfba6975e8482f9fe0d52ead4956f106..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmV;H0BQet0V^p=O;s>7F=sF|FfcPQQP4}zEXmDJDa}bOX3%bP3g55mxpvo$icp6e
z0S3!Bg8oC5<yNL;=A;@jEZy_?uWIUzFA<?pJo!!+0=!zfuc9b1VvykZVbq|s@7&8(
zi^8k=TV83;w@^1UGXMgG{F02+qWGfJf_w(2V7?i-yHnfiZd{XDa6;^f>eFL-0IJ$O
E95viYm;e9(

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleReset/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e
deleted file mode 100644
index 64d20cb1ea175608a3e05acff298a97ed57eb7b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmV;H0BQet0gaA93c@fDMP26<*$Xn6B$Eb2gsyswNjrlDV@rvkw>L*{``_d7=dISY
zS(n499U_*K4~}D2SQZh@l!dYu@-!gPf>=N?I5ImQ@@keNaC8_G4FHb4Fp^g-X=W{R
zz}|wvMQ`}s9@}BZ$zI3lE+4M@Q!evXZ?@x*GNzdA861G=Yd_WGPu<k7u1`Vp1Ej$@
E=Z{%N+5i9m

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440
deleted file mode 100644
index d63e62eeca50a7809f2ff6d9a906526fbe697acf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 152
zcmV;J0B8Sr0gaA93c@fH1zqP9*$a}N^rs1k2wn9UN&YJe#*~_Z$G1mtJ2Q(Zt=4DP
z)|gY@0BwP63&9UeLXJXa<AEZwMCUWd#EY{zs5NbPcRg5k1~GWa*>f02NDxmYnG(q3
z(BR@NRNDKaZF-vZb(-(^rn<gxDXrc#u^Yx{M~?bz$QX6dW2)oNTqP0x*>i2Ozo33#
G*F5F}&`WRt

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153
deleted file mode 100644
index 5dd5f3236..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��M
-�0@�s��J&N������	I�޾���/�Z�H����R��%d"��r@�X<-4dG��5�?���fxN�(_��&������6�]���פ˟\ճ����
5,�
\ No newline at end of file
diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
deleted file mode 100644
index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21
ccmb<m^geacKgb|i!&6t!@Cg%x>`~^A08nuUMF0Q*

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
deleted file mode 100644
index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77
zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%t<w5Si0x&U)9tbUm`-Ic=DYt1bDS{
jUqw-3#2~@*!>B=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg

diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/refs/heads/master b/test/integration/submoduleReset/expected/repo/.git_keep/refs/heads/master
deleted file mode 100644
index ad2d893d7..000000000
--- a/test/integration/submoduleReset/expected/repo/.git_keep/refs/heads/master
+++ /dev/null
@@ -1 +0,0 @@
-9d10a5a0a21eb2cfdb6206f474ed57fd5cd51440
diff --git a/test/integration/submoduleReset/expected/repo/.gitmodules_keep b/test/integration/submoduleReset/expected/repo/.gitmodules_keep
deleted file mode 100644
index 2b864257b..000000000
--- a/test/integration/submoduleReset/expected/repo/.gitmodules_keep
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "other_repo"]
-	path = other_repo
-	url = ../other_repo
diff --git a/test/integration/submoduleReset/expected/repo/myfile1 b/test/integration/submoduleReset/expected/repo/myfile1
deleted file mode 100644
index a5bce3fd2..000000000
--- a/test/integration/submoduleReset/expected/repo/myfile1
+++ /dev/null
@@ -1 +0,0 @@
-test1
diff --git a/test/integration/submoduleReset/expected/repo/myfile2 b/test/integration/submoduleReset/expected/repo/myfile2
deleted file mode 100644
index 180cf8328..000000000
--- a/test/integration/submoduleReset/expected/repo/myfile2
+++ /dev/null
@@ -1 +0,0 @@
-test2
diff --git a/test/integration/submoduleReset/expected/repo/other_repo/.git_keep b/test/integration/submoduleReset/expected/repo/other_repo/.git_keep
deleted file mode 100644
index 32e5ae2e6..000000000
--- a/test/integration/submoduleReset/expected/repo/other_repo/.git_keep
+++ /dev/null
@@ -1 +0,0 @@
-gitdir: ../.git/modules/other_repo
diff --git a/test/integration/submoduleReset/expected/repo/other_repo/myfile1 b/test/integration/submoduleReset/expected/repo/other_repo/myfile1
deleted file mode 100644
index a5bce3fd2..000000000
--- a/test/integration/submoduleReset/expected/repo/other_repo/myfile1
+++ /dev/null
@@ -1 +0,0 @@
-test1
diff --git a/test/integration/submoduleReset/expected/repo/other_repo/myfile2 b/test/integration/submoduleReset/expected/repo/other_repo/myfile2
deleted file mode 100644
index 180cf8328..000000000
--- a/test/integration/submoduleReset/expected/repo/other_repo/myfile2
+++ /dev/null
@@ -1 +0,0 @@
-test2
diff --git a/test/integration/submoduleReset/recording.json b/test/integration/submoduleReset/recording.json
deleted file mode 100644
index 2b272d7f5..000000000
--- a/test/integration/submoduleReset/recording.json
+++ /dev/null
@@ -1 +0,0 @@
-{"KeyEvents":[{"Timestamp":653,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1685,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2749,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2893,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3229,"Mod":0,"Key":256,"Ch":100},{"Timestamp":3661,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4069,"Mod":0,"Key":260,"Ch":0},{"Timestamp":4189,"Mod":0,"Key":260,"Ch":0},{"Timestamp":5180,"Mod":0,"Key":256,"Ch":78},{"Timestamp":6508,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7311,"Mod":0,"Key":27,"Ch":0},{"Timestamp":8212,"Mod":0,"Key":256,"Ch":91},{"Timestamp":10268,"Mod":0,"Key":256,"Ch":100},{"Timestamp":12165,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13741,"Mod":0,"Key":256,"Ch":93},{"Timestamp":14317,"Mod":0,"Key":13,"Ch":13},{"Timestamp":16645,"Mod":0,"Key":259,"Ch":0},{"Timestamp":16805,"Mod":0,"Key":259,"Ch":0},{"Timestamp":17005,"Mod":0,"Key":259,"Ch":0},{"Timestamp":18588,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
\ No newline at end of file
diff --git a/test/integration/submoduleReset/setup.sh b/test/integration/submoduleReset/setup.sh
deleted file mode 100644
index cd5b3ce64..000000000
--- a/test/integration/submoduleReset/setup.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $1
-
-export GIT_COMMITTER_DATE="Mon 20 Aug 2018 20:19:19 BST"
-export GIT_AUTHOR_DATE="Mon 20 Aug 2018 20:19:19 BST"
-
-git init
-
-git config user.email "CI@example.com"
-git config user.name "CI"
-
-echo test1 > myfile1
-git add .
-git commit -am "myfile1"
-echo test2 > myfile2
-git add .
-git commit -am "myfile2"
-
-cd ..
-git clone --bare ./repo other_repo
-cd repo
-
-git -c protocol.file.allow=always submodule add ../other_repo
-git commit -am "add submodule"
diff --git a/test/integration/submoduleReset/test.json b/test/integration/submoduleReset/test.json
deleted file mode 100644
index ccac209e4..000000000
--- a/test/integration/submoduleReset/test.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "description": "After making some changes in a submodule, we reset the submodule from the parent repo",
-  "speed": 10
-}