Exclude VCS directory with writing from an archive

See https://savannah.gnu.org/bugs/?62859
This commit is contained in:
Anton Makrushin
2023-03-20 20:05:42 +05:30
committed by Sergey Poznyakoff
parent 4177c98bcc
commit 4f814e0e4c
4 changed files with 93 additions and 1 deletions

4
po/.gitignore vendored
View File

@@ -1,3 +1,7 @@
/remove-potcdate.sin~
/insert-header.sin~
/en@quot.header~
/en@boldquot.header~
/Makefile.in.in
/Makevars.template
/Rules-quot

View File

@@ -348,7 +348,7 @@ handle_file_selection_option (int key, const char *arg)
break;
case EXCLUDE_VCS_OPTION:
add_exclude_array (vcs_file_table, 0);
add_exclude_array (vcs_file_table, FNM_LEADING_DIR);
break;
case EXCLUDE_VCS_IGNORES_OPTION:

87
tests/exclude18.at Normal file
View File

@@ -0,0 +1,87 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
# Copyright 2004-2023 Free Software Foundation, Inc.
# This file is part of GNU tar.
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
# GNU tar is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test --exclude-vcs option with subcommands: EXTRACT, LIST, DIFF.
# Check VCS directory with files, and empty.
#
# Ref: https://savannah.gnu.org/bugs/?62859
# Wed 03 Aug 2022 04:06:28 PM UTC, original submission: Quote
# Mohamed Akram <mohdakram>
# > The --exclude-vcs flag seems to exclude .gitignore but not .git when
# extracting.
AT_SETUP([--exclude-vcs extract list compare])
AT_KEYWORDS([exclude-vcs extract list compare exclude18])
AT_TAR_CHECK([
AT_SORT_PREREQ
mkdir gitrepo
cd gitrepo
# Make an empty VCS directory:
mkdir .svn
# Make a VCS directory with a file:
mkdir .git
touch .git/_A
# Make a VCS file:
touch .gitignore
# Make non-VCS files:
touch .git_B
touch _C
# Create an archive, include VCS:
cd ..
tar -cf gitrepo.tar gitrepo
rm -r gitrepo
echo Extract:
tar -xvf gitrepo.tar --exclude-vcs | sort
echo
echo List:
tar -tf gitrepo.tar --exclude-vcs | sort
echo
echo Diff:
tar -dvf gitrepo.tar --exclude-vcs gitrepo | sort
],
[0],
[Extract:
gitrepo/
gitrepo/.git_B
gitrepo/_C
List:
gitrepo/
gitrepo/.git_B
gitrepo/_C
Diff:
gitrepo/
gitrepo/.git_B
gitrepo/_C
],
[])
AT_CLEANUP

View File

@@ -313,6 +313,7 @@ m4_include([exclude14.at])
m4_include([exclude15.at])
m4_include([exclude16.at])
m4_include([exclude17.at])
m4_include([exclude18.at])
AT_BANNER([Deletions])
m4_include([delete01.at])