diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/COMMIT_EDITMSG
new file mode 100644
index 000000000..5852f4463
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/COMMIT_EDITMSG
@@ -0,0 +1 @@
+Initial commit
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/FETCH_HEAD
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/HEAD b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/HEAD
new file mode 100644
index 000000000..cb089cd89
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/ORIG_HEAD
new file mode 100644
index 000000000..a3df47f69
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/ORIG_HEAD
@@ -0,0 +1 @@
+592d439043d07cd223cbde4b3a0884b94634437b
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/config b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/config
new file mode 100644
index 000000000..8ae104545
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/config
@@ -0,0 +1,10 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
+[user]
+	email = CI@example.com
+	name = CI
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/description b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/index b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/index
new file mode 100644
index 000000000..65d675154
Binary files /dev/null and b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/index differ
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/info/exclude b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/info/exclude
@@ -0,0 +1,6 @@
+# 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]
+# *~
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/HEAD b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/HEAD
new file mode 100644
index 000000000..8daa2233e
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/HEAD
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 592d439043d07cd223cbde4b3a0884b94634437b CI <CI@example.com> 1654284027 -0230	commit (initial): Initial commit
+592d439043d07cd223cbde4b3a0884b94634437b 592d439043d07cd223cbde4b3a0884b94634437b CI <CI@example.com> 1654284036 -0230	reset: moving to HEAD
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/heads/master
new file mode 100644
index 000000000..1074c856f
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/heads/master
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 592d439043d07cd223cbde4b3a0884b94634437b CI <CI@example.com> 1654284027 -0230	commit (initial): Initial commit
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/stash b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/stash
new file mode 100644
index 000000000..f33d8a619
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/stash
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 b3c24805b28fa5e90b5807bb402b123974f13d61 CI <CI@example.com> 1654284036 -0230	WIP on master: 592d439 Initial commit
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/02/8cf118f08271dc2b9dd68d72a65918df664951 b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/02/8cf118f08271dc2b9dd68d72a65918df664951
new file mode 100644
index 000000000..4032664a3
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/02/8cf118f08271dc2b9dd68d72a65918df664951
@@ -0,0 +1,2 @@
+x
��[
+�0E��*fJ&�&""���H�S6��)�|n���9�R-%7@�Ome:ץQoX�d�Gt!("�d;�nqoϺB?�����=�j�:k�7R;8K��8���ؗ�Fz�S�y��@���_�5`Xr�q�_Z|
j�:�
\ No newline at end of file
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/09/767bd3484e22b41138116992cc1cb5bc45fb7f b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/09/767bd3484e22b41138116992cc1cb5bc45fb7f
new file mode 100644
index 000000000..d09fb5ad6
Binary files /dev/null and b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/09/767bd3484e22b41138116992cc1cb5bc45fb7f differ
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
new file mode 100644
index 000000000..adf64119a
Binary files /dev/null and b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/59/2d439043d07cd223cbde4b3a0884b94634437b b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/59/2d439043d07cd223cbde4b3a0884b94634437b
new file mode 100644
index 000000000..d695a40a5
Binary files /dev/null and b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/59/2d439043d07cd223cbde4b3a0884b94634437b differ
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/b3/c24805b28fa5e90b5807bb402b123974f13d61 b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/b3/c24805b28fa5e90b5807bb402b123974f13d61
new file mode 100644
index 000000000..594fc8032
Binary files /dev/null and b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/b3/c24805b28fa5e90b5807bb402b123974f13d61 differ
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/db/0f86d5434dd5e5f3a2210f9a7edf5a816ae935 b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/db/0f86d5434dd5e5f3a2210f9a7edf5a816ae935
new file mode 100644
index 000000000..b3d2804ff
Binary files /dev/null and b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/db/0f86d5434dd5e5f3a2210f9a7edf5a816ae935 differ
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
new file mode 100644
index 000000000..711223894
Binary files /dev/null and b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 differ
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/refs/heads/master b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/refs/heads/master
new file mode 100644
index 000000000..a3df47f69
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/refs/heads/master
@@ -0,0 +1 @@
+592d439043d07cd223cbde4b3a0884b94634437b
diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/refs/stash b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/refs/stash
new file mode 100644
index 000000000..ffd33ef5c
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/refs/stash
@@ -0,0 +1 @@
+b3c24805b28fa5e90b5807bb402b123974f13d61
diff --git a/test/integration/stashIncludeUntrackedChanges/recording.json b/test/integration/stashIncludeUntrackedChanges/recording.json
new file mode 100644
index 000000000..be590bf9d
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/recording.json
@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":3590,"Mod":0,"Key":256,"Ch":83},{"Timestamp":6045,"Mod":0,"Key":256,"Ch":85},{"Timestamp":7792,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15045,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":294,"Height":79}]}
\ No newline at end of file
diff --git a/test/integration/stashIncludeUntrackedChanges/setup.sh b/test/integration/stashIncludeUntrackedChanges/setup.sh
new file mode 100644
index 000000000..4912cbb3e
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/setup.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+cd $1
+
+git init
+
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+git commit --allow-empty -m "Initial commit"
+
+touch file0
diff --git a/test/integration/stashIncludeUntrackedChanges/test.json b/test/integration/stashIncludeUntrackedChanges/test.json
new file mode 100644
index 000000000..b67e32c62
--- /dev/null
+++ b/test/integration/stashIncludeUntrackedChanges/test.json
@@ -0,0 +1 @@
+{ "description": "Stashing all files including untracked files", "speed": 20 }