Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[git] Update to version 2.34.5. JB#59426 #5

Merged
merged 1 commit into from Nov 24, 2022
Merged

[git] Update to version 2.34.5. JB#59426 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion git
Open in desktop
Submodule git updated 1978 files
54 changes: 32 additions & 22 deletions rpm/0001-disable-gitweb.patch
View file
Open in desktop
@@ -1,18 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Marko Lemmetty <marko.lemmetty@jollamobile.com>
Date: Thu, 6 Feb 2020 17:14:23 +0200
Subject: [PATCH] disable gitweb

---
Documentation/Makefile | 4 ++++
Makefile | 24 +++++++++++++++++++++++-
2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 8fe829cc1b..239eceebec 100644
index ed656db2ae90c1f5e0498867ec170395f6898b1f..5997c6766a88ef5efbaae559592d468b4d81bd73 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -15,14 +15,18 @@ MAN1_TXT += $(filter-out \
@@ -17,7 +17,9 @@ MAN1_TXT += $(filter-out \
$(wildcard git-*.txt))
MAN1_TXT += git.txt
MAN1_TXT += gitk.txt
+ifdef USE_GITWEB
MAN1_TXT += gitweb.txt
+endif

# man5 / man7 guides (note: new guides should also be added to command-list.txt)
MAN5_TXT += gitattributes.txt
MAN5_TXT += githooks.txt
MAN5_TXT += gitignore.txt
@@ -26,7 +28,9 @@ MAN5_TXT += gitignore.txt
MAN5_TXT += gitmailmap.txt
MAN5_TXT += gitmodules.txt
MAN5_TXT += gitrepository-layout.txt
+ifdef USE_GITWEB
Expand All @@ -22,10 +33,10 @@ index 8fe829cc1b..239eceebec 100644
MAN7_TXT += gitcli.txt
MAN7_TXT += gitcore-tutorial.txt
diff --git a/Makefile b/Makefile
index 09f98b777c..b0aba19436 100644
index 12be39ac49789898227d025c5249ce5d2842ae47..428462c4f8c3fca5b40add60069e33c27942b6d8 100644
--- a/Makefile
+++ b/Makefile
@@ -659,10 +659,16 @@ clean-perl-script:
@@ -651,10 +651,16 @@ clean-perl-script:
clean-python-script:
$(RM) $(SCRIPT_PYTHON_GEN)

Expand All @@ -37,30 +48,30 @@ index 09f98b777c..b0aba19436 100644
+else
+SCRIPTS = $(SCRIPT_SH_GEN) \
+ $(SCRIPT_PERL_GEN) \
+ $(SCRIPT_PYTHON_GEN)
+ $(SCRIPT_PYTHON_GEN)
+endif

ETAGS_TARGET = TAGS

@@ -2263,6 +2269,7 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
@@ -2362,6 +2368,7 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
perllibdir:
@echo '$(perllibdir_SQ)'

+ifdef USE_GITWEB
.PHONY: gitweb
gitweb:
$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
@@ -2271,7 +2278,9 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
@@ -2370,7 +2377,9 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
$(QUIET_GEN)$(cmd_munge_script) && \
chmod +x $@+ && \
mv $@+ $@
+endif # USE_GITWEB
else # NO_PERL
+ifdef USE_GITWEB
$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
$(QUIET_GEN)$(RM) $@ $@+ && \
$(QUIET_GEN) \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
@@ -2279,8 +2288,10 @@ $(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
@@ -2378,8 +2387,10 @@ $(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
unimplemented.sh >$@+ && \
chmod +x $@+ && \
mv $@+ $@
Expand All @@ -71,7 +82,7 @@ index 09f98b777c..b0aba19436 100644
# This makes sure we depend on the NO_PYTHON setting itself.
$(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS

@@ -2920,7 +2931,9 @@ ifndef NO_PERL
@@ -3044,7 +3055,9 @@ ifndef NO_PERL
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perllibdir_SQ)'
(cd perl/build/lib && $(TAR) cf - .) | \
(cd '$(DESTDIR_SQ)$(perllibdir_SQ)' && umask 022 && $(TAR) xof -)
Expand All @@ -81,10 +92,10 @@ index 09f98b777c..b0aba19436 100644
endif
ifndef NO_TCLTK
$(MAKE) -C gitk-git install
@@ -2972,12 +2985,16 @@ endif
@@ -3098,11 +3111,16 @@ endif
ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; } \
done && \
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
done
-
+ifdef USE_GITWEB
.PHONY: install-gitweb install-doc install-man install-man-perl install-html install-info install-pdf
Expand All @@ -95,12 +106,11 @@ index 09f98b777c..b0aba19436 100644
+ifdef USE_GITWEB
install-gitweb:
$(MAKE) -C gitweb install
-
+endif

install-doc: install-man-perl
$(MAKE) -C Documentation install

@@ -3113,7 +3130,9 @@ clean: profile-clean coverage-clean cocciclean
@@ -3246,7 +3264,9 @@ clean: profile-clean coverage-clean cocciclean
$(MAKE) -C Documentation/ clean
$(RM) Documentation/GIT-EXCLUDED-PROGRAMS
ifndef NO_PERL
Expand All @@ -110,13 +120,13 @@ index 09f98b777c..b0aba19436 100644
$(RM) -r perl/build/
endif
$(MAKE) -C templates/ clean
@@ -3148,7 +3167,9 @@ endif
ALL_COMMANDS = $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS)
ALL_COMMANDS += git
@@ -3283,7 +3303,9 @@ ALL_COMMANDS += git
ALL_COMMANDS += git-citool
ALL_COMMANDS += git-gui
ALL_COMMANDS += gitk
+ifdef USE_GITWEB
ALL_COMMANDS += gitweb
+endif
ALL_COMMANDS += git-gui git-citool

.PHONY: check-docs
check-docs::
17 changes: 1 addition & 16 deletions rpm/git.spec
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
%global use_new_rpm_filters 1

Name: git
Version: 2.26.2
Version: 0
Release: 1
Summary: Fast Version Control System
License: GPLv2
Expand Down Expand Up @@ -222,16 +222,6 @@ export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null)
# contrib/svn-fe which all require python2.
rm -rf contrib/fast-import/import-zips.py contrib/hg-to-git contrib/svn-fe

# The multimail hook is installed with git. Use python3 to avoid an
# unnecessary python2 dependency, if possible.
%if %{with python3}
sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \
contrib/hooks/multimail/git_multimail.py \
contrib/hooks/multimail/migrate-mailhook-config \
contrib/hooks/multimail/post-receive.example
%endif
# endif with python3

%install
%make_install %{?with_docs:install-doc}

Expand Down Expand Up @@ -306,9 +296,6 @@ mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion
install -pm 644 contrib/completion/git-completion.tcsh \
%{buildroot}%{_datadir}/git-core/contrib/completion/

# Drop .py extension from git_multimail to avoid byte-compiling
mv contrib/hooks/multimail/git_multimail{.py,}

# Move contrib/hooks out of %%docdir
mkdir -p %{buildroot}%{_datadir}/git-core/contrib
mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
Expand Down Expand Up @@ -398,7 +385,6 @@ exit 0

%files -f bin-man-doc-git-files
%{_datadir}/git-core/contrib/diff-highlight
%{_datadir}/git-core/contrib/hooks/multimail
%{_datadir}/git-core/contrib/hooks/update-paranoid
%{_datadir}/git-core/contrib/hooks/setgitperms.perl
%{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample
Expand All @@ -415,7 +401,6 @@ exit 0
%license COPYING
# exclude is best way here because of troubles with symlinks inside git-core/
%exclude %{_datadir}/git-core/contrib/diff-highlight
%exclude %{_datadir}/git-core/contrib/hooks/multimail
%exclude %{_datadir}/git-core/contrib/hooks/update-paranoid
%exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl
%exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample
Expand Down