rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove unnecessary "chmod +x contrib/hooks/*"

Browse Source 
Using a simple glob in contrib/hooks/* to match contributed hook scripts
was valid when it was added in 762cf11 ("Update to git-1.6.3.3 - Move
contributed hooks to %{_datadir}/git-core/contrib/hooks (bug 500137)",
2009-06-28).  With the addition of the multimail directory in git-1.8.4
it was no longer doing what was intended.

However, the scripts in contrib/hooks all ship with the execute bit set,
making the "chmod +x" unnecessary.  If we did descend into the multimail
directory with a chmod (whether via "chmod -R" or "find | xargs ..."),
we would need to exclude the non-script files within that directory.
This commit is contained in:
Todd Zullinger 2018-03-22 01:48:06 -04:00
parent 28cb1fda84
commit c538f21825
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git.spec
View File

@ -548,10 +548,9 @@ install -pm 644 contrib/completion/git-completion.tcsh \
# Drop .py extension from git_multimail to avoid byte-compiling # Drop .py extension from git_multimail to avoid byte-compiling
mv contrib/hooks/multimail/git_multimail{.py,} mv contrib/hooks/multimail/git_multimail{.py,}
# Move contrib/hooks out of %%docdir and make them executable # Move contrib/hooks out of %%docdir
mkdir -p %{buildroot}%{_datadir}/git-core/contrib mkdir -p %{buildroot}%{_datadir}/git-core/contrib
mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
chmod +x %{buildroot}%{_datadir}/git-core/contrib/hooks/*
pushd contrib > /dev/null pushd contrib > /dev/null
ln -s ../../../git-core/contrib/hooks ln -s ../../../git-core/contrib/hooks
popd > /dev/null popd > /dev/null
@ -814,6 +813,7 @@ make test || ./print-failed-test-output
%changelog %changelog
* Thu Mar 22 2018 Todd Zullinger <tmz@pobox.com> - 2.17.0-0.1.rc1.1 * Thu Mar 22 2018 Todd Zullinger <tmz@pobox.com> - 2.17.0-0.1.rc1.1
- Drop .py extension from contrib/hooks/multimail/git_multimail.py - Drop .py extension from contrib/hooks/multimail/git_multimail.py
- Remove unnecessary "chmod +x contrib/hooks/*"
* Wed Mar 21 2018 Todd Zullinger <tmz@pobox.com> - 2.17.0-0.1.rc1 * Wed Mar 21 2018 Todd Zullinger <tmz@pobox.com> - 2.17.0-0.1.rc1
- Update to 2.17.0-rc1 - Update to 2.17.0-rc1