From 9e67138819c7e081fee89a5b855c89b538a8f604 Mon Sep 17 00:00:00 2001
From: Jirka <jirka.borovec@seznam.cz>
Date: Thu, 30 May 2024 12:22:45 +0200
Subject: [PATCH 1/3] precommit: enable `end-of-file-fixer`
---
.pre-commit-config.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 585b4f04d..50f430084 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,6 +18,7 @@ repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
+ - id: end-of-file-fixer
- id: check-toml
- id: check-yaml
- id: check-merge-conflict
From 96e21f0055060b01d03b705cdb582edd3551aa43 Mon Sep 17 00:00:00 2001
From: Jirka <jirka.borovec@seznam.cz>
Date: Thu, 30 May 2024 12:24:19 +0200
Subject: [PATCH 2/3] apply
---
doc/source/index.rst | 1 -
doc/source/intro.rst | 1 -
doc/source/roadmap.rst | 1 -
test/fixtures/.gitconfig | 2 +-
test/fixtures/blame | 2 +-
test/fixtures/cat_file_blob | 2 +-
test/fixtures/git_config | 1 -
test/fixtures/git_config_with_empty_value | 2 +-
test/fixtures/rev_list_bisect_all | 1 -
test/fixtures/rev_list_commit_diffs | 1 -
test/fixtures/rev_list_commit_idabbrev | 1 -
test/fixtures/rev_list_commit_stats | 1 -
12 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 72db8ee5a..ca5229ac3 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -21,4 +21,3 @@ Indices and tables
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
-
diff --git a/doc/source/intro.rst b/doc/source/intro.rst
index 4f22a0942..d053bd117 100644
--- a/doc/source/intro.rst
+++ b/doc/source/intro.rst
@@ -122,4 +122,3 @@ License Information
===================
GitPython is licensed under the New BSD License. See the LICENSE file for
more information.
-
diff --git a/doc/source/roadmap.rst b/doc/source/roadmap.rst
index a573df33a..34c953626 100644
--- a/doc/source/roadmap.rst
+++ b/doc/source/roadmap.rst
@@ -6,4 +6,3 @@ The full list of milestones including associated tasks can be found on GitHub:
https://github.com/gitpython-developers/GitPython/issues
Select the respective milestone to filter the list of issues accordingly.
-
diff --git a/test/fixtures/.gitconfig b/test/fixtures/.gitconfig
index 6a0459f6b..f6c25c15a 100644
--- a/test/fixtures/.gitconfig
+++ b/test/fixtures/.gitconfig
@@ -1,3 +1,3 @@
[alias]
rbi = "!g() { git rebase -i origin/${1:-master} ; } ; g"
- expush = "!f() { git branch -f tmp ; { git rbi $1 && git push ; } ; git reset --hard tmp ; git rebase origin/${1:-master}; } ; f"
\ No newline at end of file
+ expush = "!f() { git branch -f tmp ; { git rbi $1 && git push ; } ; git reset --hard tmp ; git rebase origin/${1:-master}; } ; f"
diff --git a/test/fixtures/blame b/test/fixtures/blame
index 10c141dda..949976c5d 100644
--- a/test/fixtures/blame
+++ b/test/fixtures/blame
@@ -128,4 +128,4 @@ b6e1b765e0c15586a2c5b9832854f95defd71e1f 23 23
634396b2f541a9f2d58b00be1a07f0c358b999b3 11 24 2
VERSION = '1.0.0'
634396b2f541a9f2d58b00be1a07f0c358b999b3 12 25
- end
\ No newline at end of file
+ end
diff --git a/test/fixtures/cat_file_blob b/test/fixtures/cat_file_blob
index 70c379b63..802992c42 100644
--- a/test/fixtures/cat_file_blob
+++ b/test/fixtures/cat_file_blob
@@ -1 +1 @@
-Hello world
\ No newline at end of file
+Hello world
diff --git a/test/fixtures/git_config b/test/fixtures/git_config
index a8cad56e8..d3066d86e 100644
--- a/test/fixtures/git_config
+++ b/test/fixtures/git_config
@@ -43,4 +43,3 @@
# inclusions should be processed immediately
[sec]
var1 = value1_main
-
diff --git a/test/fixtures/git_config_with_empty_value b/test/fixtures/git_config_with_empty_value
index 0427caea5..83de84c8b 100644
--- a/test/fixtures/git_config_with_empty_value
+++ b/test/fixtures/git_config_with_empty_value
@@ -1,4 +1,4 @@
[color]
ui
[core]
- filemode = true
\ No newline at end of file
+ filemode = true
diff --git a/test/fixtures/rev_list_bisect_all b/test/fixtures/rev_list_bisect_all
index 342ea94ae..60d382d01 100644
--- a/test/fixtures/rev_list_bisect_all
+++ b/test/fixtures/rev_list_bisect_all
@@ -48,4 +48,3 @@ committer David Aguilar <davvid@gmail.com> 1220418344 -0700
This resolves the issue mentioned in that thread.
Signed-off-by: David Aguilar <davvid@gmail.com>
-
diff --git a/test/fixtures/rev_list_commit_diffs b/test/fixtures/rev_list_commit_diffs
index 20397e2e4..c39df2061 100644
--- a/test/fixtures/rev_list_commit_diffs
+++ b/test/fixtures/rev_list_commit_diffs
@@ -5,4 +5,3 @@ author Tom Preston-Werner <tom@mojombo.com> 1193200199 -0700
committer Tom Preston-Werner <tom@mojombo.com> 1193200199 -0700
fix some initialization warnings
-
diff --git a/test/fixtures/rev_list_commit_idabbrev b/test/fixtures/rev_list_commit_idabbrev
index 9385ba713..6266df93e 100644
--- a/test/fixtures/rev_list_commit_idabbrev
+++ b/test/fixtures/rev_list_commit_idabbrev
@@ -5,4 +5,3 @@ author tom <tom@taco.(none)> 1195608462 -0800
committer tom <tom@taco.(none)> 1195608462 -0800
fix tests on other machines
-
diff --git a/test/fixtures/rev_list_commit_stats b/test/fixtures/rev_list_commit_stats
index 60aa8cf58..c78aadeb5 100644
--- a/test/fixtures/rev_list_commit_stats
+++ b/test/fixtures/rev_list_commit_stats
@@ -4,4 +4,3 @@ author Tom Preston-Werner <tom@mojombo.com> 1191997100 -0700
committer Tom Preston-Werner <tom@mojombo.com> 1191997100 -0700
initial grit setup
-
From 366a60760cea066b40ed33815fa8256b25afdfcc Mon Sep 17 00:00:00 2001
From: jirka <jirka.borovec@seznam.cz>
Date: Tue, 16 Jul 2024 12:35:36 +0200
Subject: [PATCH 3/3] exclude: test/fixtures/
---
.pre-commit-config.yaml | 1 +
test/fixtures/.gitconfig | 2 +-
test/fixtures/blame | 2 +-
test/fixtures/cat_file_blob | 2 +-
test/fixtures/git_config | 1 +
test/fixtures/git_config_with_empty_value | 2 +-
test/fixtures/rev_list_bisect_all | 1 +
test/fixtures/rev_list_commit_diffs | 1 +
test/fixtures/rev_list_commit_idabbrev | 1 +
test/fixtures/rev_list_commit_stats | 1 +
10 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 50f430084..5491c4297 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,6 +19,7 @@ repos:
rev: v4.5.0
hooks:
- id: end-of-file-fixer
+ exclude: test/fixtures/
- id: check-toml
- id: check-yaml
- id: check-merge-conflict
diff --git a/test/fixtures/.gitconfig b/test/fixtures/.gitconfig
index f6c25c15a..6a0459f6b 100644
--- a/test/fixtures/.gitconfig
+++ b/test/fixtures/.gitconfig
@@ -1,3 +1,3 @@
[alias]
rbi = "!g() { git rebase -i origin/${1:-master} ; } ; g"
- expush = "!f() { git branch -f tmp ; { git rbi $1 && git push ; } ; git reset --hard tmp ; git rebase origin/${1:-master}; } ; f"
+ expush = "!f() { git branch -f tmp ; { git rbi $1 && git push ; } ; git reset --hard tmp ; git rebase origin/${1:-master}; } ; f"
\ No newline at end of file
diff --git a/test/fixtures/blame b/test/fixtures/blame
index 949976c5d..10c141dda 100644
--- a/test/fixtures/blame
+++ b/test/fixtures/blame
@@ -128,4 +128,4 @@ b6e1b765e0c15586a2c5b9832854f95defd71e1f 23 23
634396b2f541a9f2d58b00be1a07f0c358b999b3 11 24 2
VERSION = '1.0.0'
634396b2f541a9f2d58b00be1a07f0c358b999b3 12 25
- end
+ end
\ No newline at end of file
diff --git a/test/fixtures/cat_file_blob b/test/fixtures/cat_file_blob
index 802992c42..70c379b63 100644
--- a/test/fixtures/cat_file_blob
+++ b/test/fixtures/cat_file_blob
@@ -1 +1 @@
-Hello world
+Hello world
\ No newline at end of file
diff --git a/test/fixtures/git_config b/test/fixtures/git_config
index d3066d86e..a8cad56e8 100644
--- a/test/fixtures/git_config
+++ b/test/fixtures/git_config
@@ -43,3 +43,4 @@
# inclusions should be processed immediately
[sec]
var1 = value1_main
+
diff --git a/test/fixtures/git_config_with_empty_value b/test/fixtures/git_config_with_empty_value
index 83de84c8b..0427caea5 100644
--- a/test/fixtures/git_config_with_empty_value
+++ b/test/fixtures/git_config_with_empty_value
@@ -1,4 +1,4 @@
[color]
ui
[core]
- filemode = true
+ filemode = true
\ No newline at end of file
diff --git a/test/fixtures/rev_list_bisect_all b/test/fixtures/rev_list_bisect_all
index 60d382d01..342ea94ae 100644
--- a/test/fixtures/rev_list_bisect_all
+++ b/test/fixtures/rev_list_bisect_all
@@ -48,3 +48,4 @@ committer David Aguilar <davvid@gmail.com> 1220418344 -0700
This resolves the issue mentioned in that thread.
Signed-off-by: David Aguilar <davvid@gmail.com>
+
diff --git a/test/fixtures/rev_list_commit_diffs b/test/fixtures/rev_list_commit_diffs
index c39df2061..20397e2e4 100644
--- a/test/fixtures/rev_list_commit_diffs
+++ b/test/fixtures/rev_list_commit_diffs
@@ -5,3 +5,4 @@ author Tom Preston-Werner <tom@mojombo.com> 1193200199 -0700
committer Tom Preston-Werner <tom@mojombo.com> 1193200199 -0700
fix some initialization warnings
+
diff --git a/test/fixtures/rev_list_commit_idabbrev b/test/fixtures/rev_list_commit_idabbrev
index 6266df93e..9385ba713 100644
--- a/test/fixtures/rev_list_commit_idabbrev
+++ b/test/fixtures/rev_list_commit_idabbrev
@@ -5,3 +5,4 @@ author tom <tom@taco.(none)> 1195608462 -0800
committer tom <tom@taco.(none)> 1195608462 -0800
fix tests on other machines
+
diff --git a/test/fixtures/rev_list_commit_stats b/test/fixtures/rev_list_commit_stats
index c78aadeb5..60aa8cf58 100644
--- a/test/fixtures/rev_list_commit_stats
+++ b/test/fixtures/rev_list_commit_stats
@@ -4,3 +4,4 @@ author Tom Preston-Werner <tom@mojombo.com> 1191997100 -0700
committer Tom Preston-Werner <tom@mojombo.com> 1191997100 -0700
initial grit setup
+