diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-07-05 18:35:24 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-07-05 19:33:44 +1000 |
| commit | 6d133fd61123cf1ced09aaa1eb5016e233e66d09 (patch) | |
| tree | 9cced350e730c6b056515b8641fbe077ce66264f /test | |
| parent | bd9e85a2d234c6af838414fbf6303017cea421a7 (diff) | |
better handling of gitignore files
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/excludeGitIgnore/expected/repo/lg_ignore_file (renamed from test/integration/excludeGitIgnore/expected/repo/.gitignore) | 0 | ||||
| -rw-r--r-- | test/integration/excludeGitIgnore/test.json | 4 | ||||
| -rw-r--r-- | test/integration/excludeMenu/expected/repo/.git_keep/info/lg_exclude_file (renamed from test/integration/excludeMenu/expected/repo/.git_keep/info/exclude) | 0 | ||||
| -rw-r--r-- | test/integration/gitignoreMenu/expected/repo/lg_ignore_file (renamed from test/integration/gitignoreMenu/expected/repo/.gitignore) | 0 | ||||
| -rw-r--r-- | test/integration/gitignoreMenu/expected/repo/myfile1 | 1 |
5 files changed, 3 insertions, 2 deletions
diff --git a/test/integration/excludeGitIgnore/expected/repo/.gitignore b/test/integration/excludeGitIgnore/expected/repo/lg_ignore_file index a5bce3fd2..a5bce3fd2 100644 --- a/test/integration/excludeGitIgnore/expected/repo/.gitignore +++ b/test/integration/excludeGitIgnore/expected/repo/lg_ignore_file diff --git a/test/integration/excludeGitIgnore/test.json b/test/integration/excludeGitIgnore/test.json index a8ca45bb0..9c466ba11 100644 --- a/test/integration/excludeGitIgnore/test.json +++ b/test/integration/excludeGitIgnore/test.json @@ -1,4 +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", + "description": "In this test we attempt to add .gitignore to .git/info/exclude to ensure lazygit rejects the action", "speed": 5 -}
\ No newline at end of file +} diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/info/exclude b/test/integration/excludeMenu/expected/repo/.git_keep/info/lg_exclude_file index ee02e5c09..ee02e5c09 100644 --- a/test/integration/excludeMenu/expected/repo/.git_keep/info/exclude +++ b/test/integration/excludeMenu/expected/repo/.git_keep/info/lg_exclude_file diff --git a/test/integration/gitignoreMenu/expected/repo/.gitignore b/test/integration/gitignoreMenu/expected/repo/lg_ignore_file index 959aad479..959aad479 100644 --- a/test/integration/gitignoreMenu/expected/repo/.gitignore +++ b/test/integration/gitignoreMenu/expected/repo/lg_ignore_file diff --git a/test/integration/gitignoreMenu/expected/repo/myfile1 b/test/integration/gitignoreMenu/expected/repo/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/gitignoreMenu/expected/repo/myfile1 @@ -0,0 +1 @@ +test1 |