From 96e6a2adc0895f14bfd71ade2783531fbd00652a Mon Sep 17 00:00:00 2001
From: Anton Bobrov <abobrov@redhat.com>
Date: Fri, 7 Jun 2024 09:43:04 -0400
Subject: [PATCH] generate_source_tarball.sh: Improve VCS exclusion

- generate_source_tarball.sh: Improve VCS exclusion
- Related: RHEL-46635
---
 java-17-openjdk.spec               | 1 +
 scripts/generate_source_tarball.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index a51ce85..6b35cd8 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -2489,6 +2489,7 @@ cjc.mainProgram(args)
 %changelog
 * Mon Jul  8 2024 Anton Bobrov <abobrov@redhat.com> - 1:17.0.12.0.6-0.1.ea
 - generate_source_tarball.sh: Use tar exclude options for VCS files
+- generate_source_tarball.sh: Improve VCS exclusion
 
 * Mon Jul  8 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.12.0.6-0.1.ea
 - generate_source_tarball.sh: Update examples in header for clarity
diff --git a/scripts/generate_source_tarball.sh b/scripts/generate_source_tarball.sh
index 5b66951..597b939 100755
--- a/scripts/generate_source_tarball.sh
+++ b/scripts/generate_source_tarball.sh
@@ -255,7 +255,7 @@ pushd "${FILE_NAME_ROOT}"
     XZ_OPT=${XZ_OPT-"-T0"} \
           tar --exclude-vcs --exclude=.jcheck --exclude=.hgtags \
           --exclude=.hgignore --exclude=.gitattributes \
-          --exclude=.gitignore --exclude=.github \
+          --exclude=.gitignore --exclude=.github --exclude=.git \
           --mtime="${TAR_TIME}" --owner=root --group=root --sort=name \
           -$SWITCH "${TARBALL_NAME}" "${TO_COMPRESS}"
     mv "${TARBALL_NAME}" ..