From d517531c16fdd5acfba6c13f5eafa04becf33147 Mon Sep 17 00:00:00 2001
From: Jakob Kogler <jakob.kogler@gmail.com>
Date: Wed, 8 Dec 2021 11:59:20 +0100
Subject: [PATCH] test remembering the commit message for a failing commit

---
 .../expected/.git_keep/COMMIT_EDITMSG         |   1 +
 .../expected/.git_keep/FETCH_HEAD             |   0
 .../expected/.git_keep/HEAD                   |   1 +
 .../expected/.git_keep/config                 |   8 +++++++
 .../expected/.git_keep/description            |   1 +
 .../expected/.git_keep/index                  | Bin 0 -> 137 bytes
 .../expected/.git_keep/info/exclude           |   6 ++++++
 .../expected/.git_keep/logs/HEAD              |   1 +
 .../expected/.git_keep/logs/refs/heads/master |   1 +
 .../89/8618af3fef6edf472d0f4a483ed8010d7bcfbb | Bin 0 -> 52 bytes
 .../8f/f64093f3a08f948519ec374010b7cb7f8416a8 | Bin 0 -> 85 bytes
 .../9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 | Bin 0 -> 20 bytes
 .../9f/4585854e11586ddf73ccab01b7a113b73b022b |   4 ++++
 .../cc/0e7e32912ae6cd02bf3ac092975307d0343e47 | Bin 0 -> 27 bytes
 .../expected/.git_keep/refs/heads/master      |   1 +
 .../expected/file1                            |   1 +
 .../recording.json                            |   1 +
 .../rememberCommitMessageAfterFail/setup.sh   |  20 ++++++++++++++++++
 .../rememberCommitMessageAfterFail/test.json  |   1 +
 19 files changed, 47 insertions(+)
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/COMMIT_EDITMSG
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/FETCH_HEAD
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/HEAD
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/config
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/description
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/index
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/info/exclude
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/HEAD
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/refs/heads/master
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/8f/f64093f3a08f948519ec374010b7cb7f8416a8
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9f/4585854e11586ddf73ccab01b7a113b73b022b
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/cc/0e7e32912ae6cd02bf3ac092975307d0343e47
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/.git_keep/refs/heads/master
 create mode 100644 test/integration/rememberCommitMessageAfterFail/expected/file1
 create mode 100644 test/integration/rememberCommitMessageAfterFail/recording.json
 create mode 100644 test/integration/rememberCommitMessageAfterFail/setup.sh
 create mode 100644 test/integration/rememberCommitMessageAfterFail/test.json

diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/COMMIT_EDITMSG
new file mode 100644
index 000000000..9daeafb98
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/COMMIT_EDITMSG
@@ -0,0 +1 @@
+test
diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/FETCH_HEAD b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/FETCH_HEAD
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/HEAD b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/HEAD
new file mode 100644
index 000000000..cb089cd89
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/config b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/config
new file mode 100644
index 000000000..596ebaeb3
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/config
@@ -0,0 +1,8 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[user]
+	email = CI@example.com
+	name = CI
diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/description b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/index b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/index
new file mode 100644
index 0000000000000000000000000000000000000000..e7625bf652d819838e2411ba3040e99fa8cc28f8
GIT binary patch
literal 137
zcmZ?q402{*U|<4b#>5TX3)xq#FM!bu3>=IMiaPZS42??|7?@u`Fazt{b?bMw`Ft@5
zT{n5(hV|EuUv$~Ogn>0JGbhy$Xbb~GNRX>5kdkCDR50M`Y?D}T|32@&yDq<%husZE
d-s<zaCzmU(Yg=<MqwnHGuI>dnan=mdB><)zF1!E$

literal 0
HcmV?d00001

diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/info/exclude b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/expected/.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/rememberCommitMessageAfterFail/expected/.git_keep/logs/HEAD b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/HEAD
new file mode 100644
index 000000000..54fca8b62
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/HEAD
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 9f4585854e11586ddf73ccab01b7a113b73b022b CI <CI@example.com> 1638960048 +0100	commit (initial): test
diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/refs/heads/master b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/refs/heads/master
new file mode 100644
index 000000000..54fca8b62
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/refs/heads/master
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 9f4585854e11586ddf73ccab01b7a113b73b022b CI <CI@example.com> 1638960048 +0100	commit (initial): test
diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb
new file mode 100644
index 0000000000000000000000000000000000000000..3f22e700010979c8aace27afa8c24396749b8482
GIT binary patch
literal 52
zcmV-40L%Y)0Rbrh*8g;JWn~~UGXOC#Fg7$aAZBT7WibGquCKX<O!P2Su9Lp7uhz%W
KM8Bjc))C0*!xk3+

literal 0
HcmV?d00001

diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/8f/f64093f3a08f948519ec374010b7cb7f8416a8 b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/8f/f64093f3a08f948519ec374010b7cb7f8416a8
new file mode 100644
index 0000000000000000000000000000000000000000..c0e2f744d1b0e46ed39d7674fd8bc294c77223fa
GIT binary patch
literal 85
zcmV-b0IL6Z0V^p=O;s>AWH2-^Ff%bxNXaZNDlI6<EK6lL!&hfCQR~@Rru|k2CQT1!
rzhGkL4po(wnUiYBFn8Vhoozl}3_{mU-nU`>wc{6E_AdbdSScVUBjX{c

literal 0
HcmV?d00001

diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4
new file mode 100644
index 0000000000000000000000000000000000000000..4667dcf6f2b51dda01be1dd1679b0195ab0e185a
GIT binary patch
literal 20
bcmb<m^geacKgb|e!&6u9Arph-GUojNN%aQ4

literal 0
HcmV?d00001

diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9f/4585854e11586ddf73ccab01b7a113b73b022b b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9f/4585854e11586ddf73ccab01b7a113b73b022b
new file mode 100644
index 000000000..8d66160f3
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9f/4585854e11586ddf73ccab01b7a113b73b022b
@@ -0,0 +1,4 @@
+x
��K
+�0@]��db�t
+"BW=F>3("u��9���{��[{x
+'�D�g����R��kE�D�2z�S.��K?{�
�n���=��[.��;�x���p�A���Oݙ|��d,r
\ No newline at end of file
diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/cc/0e7e32912ae6cd02bf3ac092975307d0343e47 b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/cc/0e7e32912ae6cd02bf3ac092975307d0343e47
new file mode 100644
index 0000000000000000000000000000000000000000..9dd2dfa079e020e6deb71e4e7f92e2ac08fce1ac
GIT binary patch
literal 27
icmb<m^geacKghr&#p9%oo|dl0NgeN}Obqt9Y}EjUlnDO-

literal 0
HcmV?d00001

diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/refs/heads/master b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/refs/heads/master
new file mode 100644
index 000000000..773f7766e
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/refs/heads/master
@@ -0,0 +1 @@
+9f4585854e11586ddf73ccab01b7a113b73b022b
diff --git a/test/integration/rememberCommitMessageAfterFail/expected/file1 b/test/integration/rememberCommitMessageAfterFail/expected/file1
new file mode 100644
index 000000000..9daeafb98
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/expected/file1
@@ -0,0 +1 @@
+test
diff --git a/test/integration/rememberCommitMessageAfterFail/recording.json b/test/integration/rememberCommitMessageAfterFail/recording.json
new file mode 100644
index 000000000..c53f51b8a
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/recording.json
@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":1916,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3421,"Mod":0,"Key":256,"Ch":99},{"Timestamp":3985,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4173,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4442,"Mod":0,"Key":256,"Ch":115},{"Timestamp":4696,"Mod":0,"Key":256,"Ch":116},{"Timestamp":6226,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7698,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10744,"Mod":0,"Key":256,"Ch":100},{"Timestamp":12856,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14484,"Mod":0,"Key":256,"Ch":99},{"Timestamp":15744,"Mod":0,"Key":13,"Ch":13},{"Timestamp":18056,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":209,"Height":52}]}
\ No newline at end of file
diff --git a/test/integration/rememberCommitMessageAfterFail/setup.sh b/test/integration/rememberCommitMessageAfterFail/setup.sh
new file mode 100644
index 000000000..934bb98fd
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/setup.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+cd $1
+
+git init
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+git checkout -b master
+
+echo "test" > file1
+echo "disruptive" > disruptive
+cat > .git/hooks/pre-commit <<EOL
+#!/bin/bash
+if [ -f disruptive ]; then
+  exit 1
+fi
+exit 0
+EOL
+chmod +x .git/hooks/pre-commit
diff --git a/test/integration/rememberCommitMessageAfterFail/test.json b/test/integration/rememberCommitMessageAfterFail/test.json
new file mode 100644
index 000000000..d5f964568
--- /dev/null
+++ b/test/integration/rememberCommitMessageAfterFail/test.json
@@ -0,0 +1 @@
+{ "description": "In this test we attempt to create a commit with the commit message `test`, but a pre-commit hook fails (the hook checks for the existance of a file called `disruptive`). Afterwards we make the pre-commit hook work (by discarding the file), and again attempt to create a commit. This time the commit message should already be remembered from the failed attempt and be prefilled.", "speed": 20 }