Allow adding a file to the .git/info/exclude file

27 files changed, 106 insertions, 0 deletions

diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/FETCH_HEAD b/test/integration/excludeGitIgnore/expected/repo/.git_keep/FETCH_HEAD
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/test/integration/excludeGitIgnore/expected/repo/.git_keep/FETCH_HEAD
diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/HEAD b/test/integration/excludeGitIgnore/expected/repo/.git_keep/HEAD
new file mode 100644
index 000000000..cb089cd89
--- /dev/null
+++ b/test/integration/excludeGitIgnore/expected/repo/.git_keep/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/config b/test/integration/excludeGitIgnore/expected/repo/.git_keep/config
new file mode 100644
index 000000000..6c9406b7d
--- /dev/null
+++ b/test/integration/excludeGitIgnore/expected/repo/.git_keep/config
@@ -0,0 +1,7 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/description b/test/integration/excludeGitIgnore/expected/repo/.git_keep/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/test/integration/excludeGitIgnore/expected/repo/.git_keep/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/info/exclude b/test/integration/excludeGitIgnore/expected/repo/.git_keep/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ b/test/integration/excludeGitIgnore/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/excludeGitIgnore/expected/repo/.gitignore b/test/integration/excludeGitIgnore/expected/repo/.gitignore
new file mode 100644
index 000000000..a5bce3fd2
--- /dev/null
+++ b/test/integration/excludeGitIgnore/expected/repo/.gitignore
@@ -0,0 +1 @@
+test1
diff --git a/test/integration/excludeGitIgnore/recording.json b/test/integration/excludeGitIgnore/recording.json
new file mode 100644
index 000000000..c6decb156
--- /dev/null
+++ b/test/integration/excludeGitIgnore/recording.json
@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":2674,"Mod":0,"Key":256,"Ch":105},{"Timestamp":4846,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8064,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8515,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":170,"Height":55}]}
\ No newline at end of file
diff --git a/test/integration/excludeGitIgnore/setup.sh b/test/integration/excludeGitIgnore/setup.sh
new file mode 100644
index 000000000..ce9563394
--- /dev/null
+++ b/test/integration/excludeGitIgnore/setup.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+cd $1
+
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+git init
+
+
+echo test1 > .gitignore
+
diff --git a/test/integration/excludeGitIgnore/test.json b/test/integration/excludeGitIgnore/test.json
new file mode 100644
index 000000000..a8ca45bb0
--- /dev/null
+++ b/test/integration/excludeGitIgnore/test.json
@@ -0,0 +1,4 @@
+{
+    "description": "In this test .gitignore is added to .git/info/exclude using the ignore or exclude menu to check that this operation is to allowed",
+    "speed": 5
+}
\ No newline at end of file
diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/FETCH_HEAD b/test/integration/excludeMenu/expected/repo/.git_keep/FETCH_HEAD
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/test/integration/excludeMenu/expected/repo/.git_keep/FETCH_HEAD
diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/HEAD b/test/integration/excludeMenu/expected/repo/.git_keep/HEAD
new file mode 100644
index 000000000..cb089cd89
--- /dev/null
+++ b/test/integration/excludeMenu/expected/repo/.git_keep/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/config b/test/integration/excludeMenu/expected/repo/.git_keep/config
new file mode 100644
index 000000000..6c9406b7d
--- /dev/null
+++ b/test/integration/excludeMenu/expected/repo/.git_keep/config
@@ -0,0 +1,7 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/description b/test/integration/excludeMenu/expected/repo/.git_keep/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/test/integration/excludeMenu/expected/repo/.git_keep/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/info/exclude b/test/integration/excludeMenu/expected/repo/.git_keep/info/exclude
new file mode 100644
index 000000000..ee02e5c09
--- /dev/null
+++ b/test/integration/excludeMenu/expected/repo/.git_keep/info/exclude
@@ -0,0 +1,8 @@
+# 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]
+# *~
+
+myfile1
\ No newline at end of file
diff --git a/test/integration/excludeMenu/expected/repo/myfile1 b/test/integration/excludeMenu/expected/repo/myfile1
new file mode 100644
index 000000000..a5bce3fd2
--- /dev/null
+++ b/test/integration/excludeMenu/expected/repo/myfile1
@@ -0,0 +1 @@
+test1
diff --git a/test/integration/excludeMenu/recording.json b/test/integration/excludeMenu/recording.json
new file mode 100644
index 000000000..1efef59a6
--- /dev/null
+++ b/test/integration/excludeMenu/recording.json
@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":1418,"Mod":0,"Key":256,"Ch":105},{"Timestamp":1725,"Mod":0,"Key":256,"Ch":101},{"Timestamp":3207,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":170,"Height":55}]}
\ No newline at end of file
diff --git a/test/integration/excludeMenu/setup.sh b/test/integration/excludeMenu/setup.sh
new file mode 100644
index 000000000..9643b2b67
--- /dev/null
+++ b/test/integration/excludeMenu/setup.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+cd $1
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+git init
+
+
+echo test1 > myfile1
+
diff --git a/test/integration/excludeMenu/test.json b/test/integration/excludeMenu/test.json
new file mode 100644
index 000000000..b2ef1f3f4
--- /dev/null
+++ b/test/integration/excludeMenu/test.json
@@ -0,0 +1,4 @@
+{
+    "description": "In this test a file is added to .git/info/exclude using the ignore or exclude menu",
+    "speed": 5
+}
\ No newline at end of file
diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/FETCH_HEAD b/test/integration/gitignoreMenu/expected/repo/.git_keep/FETCH_HEAD
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/FETCH_HEAD
diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/HEAD b/test/integration/gitignoreMenu/expected/repo/.git_keep/HEAD
new file mode 100644
index 000000000..cb089cd89
--- /dev/null
+++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/config b/test/integration/gitignoreMenu/expected/repo/.git_keep/config
new file mode 100644
index 000000000..6c9406b7d
--- /dev/null
+++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/config
@@ -0,0 +1,7 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/description b/test/integration/gitignoreMenu/expected/repo/.git_keep/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude b/test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ b/test/integration/gitignoreMenu/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/gitignoreMenu/expected/repo/.gitignore b/test/integration/gitignoreMenu/expected/repo/.gitignore
new file mode 100644
index 000000000..959aad479
--- /dev/null
+++ b/test/integration/gitignoreMenu/expected/repo/.gitignore
@@ -0,0 +1,2 @@
+
+myfile1
\ No newline at end of file
diff --git a/test/integration/gitignoreMenu/recording.json b/test/integration/gitignoreMenu/recording.json
new file mode 100644
index 000000000..7b2531e84
--- /dev/null
+++ b/test/integration/gitignoreMenu/recording.json
@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":3418,"Mod":0,"Key":256,"Ch":105},{"Timestamp":3721,"Mod":0,"Key":256,"Ch":105},{"Timestamp":5154,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":170,"Height":55}]}
\ No newline at end of file
diff --git a/test/integration/gitignoreMenu/setup.sh b/test/integration/gitignoreMenu/setup.sh
new file mode 100644
index 000000000..9643b2b67
--- /dev/null
+++ b/test/integration/gitignoreMenu/setup.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+cd $1
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+git init
+
+
+echo test1 > myfile1
+
diff --git a/test/integration/gitignoreMenu/test.json b/test/integration/gitignoreMenu/test.json
new file mode 100644
index 000000000..de26df98c
--- /dev/null
+++ b/test/integration/gitignoreMenu/test.json
@@ -0,0 +1,4 @@
+{
+    "description": "In this test a file is added to .gitingnore using the ignore or exclude menu",
+    "speed": 5
+}
\ No newline at end of file