From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?Bj=C3=B6rn?= Bidar via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#74413: [PATCH] Allow to store and read repository information of VCS builds Date: Mon, 18 Nov 2024 10:18:11 +0200 Message-ID: <23398.418659211$1731918000@news.gmane.org> Reply-To: =?UTF-8?Q?Bj=C3=B6rn?= Bidar Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17954"; mail-complaints-to="usenet@ciao.gmane.io" To: 74413@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Nov 18 09:19:51 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tCwz8-0004Nu-VU for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 18 Nov 2024 09:19:51 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCwyj-0007PF-TO; Mon, 18 Nov 2024 03:19:26 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tCwyN-0007O0-RO for bug-gnu-emacs@gnu.org; Mon, 18 Nov 2024 03:19:10 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tCwyN-0001uS-IC for bug-gnu-emacs@gnu.org; Mon, 18 Nov 2024 03:19:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=GqZvBPT7I0TRrLQUDZHXbC30pXHKvXgt5bRbuMGaDHs=; b=Bf7D+4ty/neD7JKqbuJWs8iZCjb1RaT1Fv6r3vBPms3Q6x35gJJ10Sr8LHK5uwHcP19YvlC6kyscR44TwHPI7qZcSuNMS/Ngq0mP33S7q7ccfKuAvz8hOlfPMDbh5vis4jmu4ONoL7frzcTjr7z3mkypPzml+49UNpfIcIb+pRDCV26GUJEEo6yOP3+skKmh3zyjKuaUCNgRNi6yOkLpown/nqUwz60uo30K7VVNszwHnWKk7x7Nt9lLrObpyAmjpf56D15flBW3XsVW6wtNcCarZLo0pXhQdv+PuUNGfLVzXDXZHFRgn6KwCAPOMa9tCW/RoEFae3UrO5GfW+HPvg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tCwyM-0004Nb-E3 for bug-gnu-emacs@gnu.org; Mon, 18 Nov 2024 03:19:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?Bj=C3=B6rn?= Bidar Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 18 Nov 2024 08:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74413 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.173191791316780 (code B ref -1); Mon, 18 Nov 2024 08:19:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 18 Nov 2024 08:18:33 +0000 Original-Received: from localhost ([127.0.0.1]:59813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCwxs-0004MZ-6B for submit@debbugs.gnu.org; Mon, 18 Nov 2024 03:18:33 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:47194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCwxn-0004MN-Un for submit@debbugs.gnu.org; Mon, 18 Nov 2024 03:18:30 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tCwxk-0007Lt-U4 for bug-gnu-emacs@gnu.org; Mon, 18 Nov 2024 03:18:26 -0500 Original-Received: from thaodan.de ([185.216.177.71]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tCwxh-0001s9-6r for bug-gnu-emacs@gnu.org; Mon, 18 Nov 2024 03:18:24 -0500 Original-Received: from odin (dsl-trebng12-50dc7b-49.dhcp.inet.fi [80.220.123.49]) by thaodan.de (Postfix) with ESMTPSA id 35F25D0005B for ; Mon, 18 Nov 2024 10:18:13 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=thaodan.de; s=mail; t=1731917893; bh=c17MiTNzM9msIl/lPX+kQ2UtRlsldw2JKbO2TiET5zM=; h=From:To:Subject:Date; b=ze+Tr27r3ud+Q4RNkPrVgcR67OD28ygrrajoLUpY4Re+eXmgmHLOjRSrIOdp5c495 zzmlECGp1MFXBOfRM3gax6GArByuLyD/MD5w2DyA80D/W6kuxtYHR+FxeIyQ2/X5uh x15ROZsMUnu/fP/L4bU8/tufNyUfs6UxRvkxYlRtQ+VyhiyaTAH5ymOADYGyJYb2cG 7DW3AEmh1oUdxYpI3V6n2OFHKMdR6euoUt3R4lrB9djkol17/ifrVrRWfSlvsDBCD/ 3KL6Lu7Hi55gkhQXiZ8hf5cZYjO09D0MofWuWcX7wl3dCotIXq+jnXhj7dSqJmk0KH dt8ctCs1am98n3ENOvlyqiYlvxclm57oLHUlLFamsF9ciuxvKGBp32xTr+hqpPjuXj k+STPb8purhY3XAY8Z4b97uPeEkdgGE4Pb/6bggP/ztqdYe0KRQWF834Z+xJOJHM2x oY/ckwRrW5UEsOuf4KUVqP9dxhEfFGQLEFurpBiROs6TlhSuOPrOC92If2DJ2HRMSR +DoGys+cJT1gUSyTK4W8/JD+IQc90t+2jIOZXnOTycL9IkNrsSv7jgKFF+x6FQATis pOpnRyESrk1t+n+byziQNScrjsyrXjf5QOlqvF0JgwSMm5flHxDqYZu9eNl1KJzDfG JLOZ+h0BicPKTeCXE1nQChAg= Autocrypt: addr=bjorn.bidar@thaodan.de; prefer-encrypt=nopreference; keydata= mDMEZNfpPhYJKwYBBAHaRw8BAQdACBEmr+0xwIIHZfIDlZmm7sa+lHHSb0g9FZrN6qE6ru60JUJq w7ZybiBCaWRhciA8Ympvcm4uYmlkYXJAdGhhb2Rhbi5kZT6IlgQTFgoAPgIbAwULCQgHAgIiAgYV CgkICwIEFgIDAQIeBwIXgBYhBFHxdut1RzAepymoq1wbdKFlHF9oBQJk1/YmAhkBAAoJEFwbdKFl HF9oB9cBAJoIIGQKXm4cpap+Flxc/EGnYl0123lcEyzuduqvlDT0AQC3OlFKm/OiqJ8IMTrzJRZ8 phFssTkSrrFXnM2jm5PYDoiTBBMWCgA7FiEEUfF263VHMB6nKairXBt0oWUcX2gFAmTX6T4CGwMF CwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQXBt0oWUcX2hbCQEAtru7kvM8hi8zo6z9ux2h K+B5xViKuo7Z8K3IXuK5ugwA+wUfKzomzdBPhfxDsqLcEziGRxoyx0Q3ld9aermBUccHtBxCasO2 cm4gQmlkYXIgPG1lQHRoYW9kYW4uZGU+iJMEExYKADsCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwEC HgcCF4AWIQRR8XbrdUcwHqcpqKtcG3ShZRxfaAUCZNf2FQAKCRBcG3ShZRxfaCzSAP4hZ7cSp0YN XYpcjHdsySh2MuBhhoPeLGXs+2kSiqBiOwD/TP8AgPEg/R+SI9GI9on7fBJJ0mp2IT8kZ2rhDOjg gA6IkwQTFgoAOxYhBFHxdut1RzAepymoq1wbdKFlH Received-SPF: pass client-ip=185.216.177.71; envelope-from=bjorn.bidar@thaodan.de; helo=thaodan.de X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, INVALID_MSGID=0.568, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:295582 Archived-At: --=-=-= Content-Type: text/plain Tags: patch Emacs has the feature to read the repository version and branch if git is installed during the build and afterwards if also the sources including the VCS repository is present. For the Android builds the feature was added to store and read the information mentioned above in a special version file. This patch reuses that mechanism so it can be reused on other platforms to use for the same reasons its available for Android and to also be able to use the information on CI workers without git installed and/or a full source checkout. The things I'm not sure about for this patch are: - Is the generating of the version file in the right place in Makefile.in - Is the data directory the right place to store the file - Should the creation of the version file be shared between the Android builds and the other platforms In GNU Emacs 31.0.50 (build 1, x86_64-suse-linux-gnu, GTK+ Version 3.24.43, cairo version 1.18.2) Repository revision: eee0ed8442aa78320a3e578ab290df145fb49624 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101014 System Description: openSUSE Tumbleweed Configured using: 'configure --disable-build-details --without-pop --with-mailutils --without-hesiod --with-gameuser=:games --with-kerberos --with-kerberos5 --with-file-notification=inotify --with-modules --enable-autodepend --enable-link-time-optimization --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --localstatedir=/var --sharedstatedir=/var/lib --libexecdir=/usr/libexec --with-file-notification=yes --libdir=/usr/lib64 --with-native-compilation=aot --enable-locallisppath=/usr/share/emacs/31.0.50/site-lisp:/usr/share/emacs/site-lisp --with-x --with-xim --with-sound --with-xpm --with-jpeg --with-tiff --with-gif --with-png --with-rsvg --with-dbus --with-xft --without-gpm --with-tree-sitter --with-x-toolkit=gtk --without-pgtk --with-toolkit-scroll-bars --x-includes=/usr/include --x-libraries=/usr/lib64 --with-libotf --with-m17n-flt --with-cairo --build=x86_64-suse-linux --with-dumping=pdumper build_alias=x86_64-suse-linux 'CC=sccache cc' 'CFLAGS=-O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -march=znver3 -mmmx -mpopcnt -msse -msse2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -msse4a -mno-fma4 -mno-xop -mfma -mbmi -mbmi2 -maes -mpclmul -mno-gfni -mvpclmulqdq -mno-3dnow -madx -mabm -mno-cldemote -mclflushopt -mclwb -mclzero -mcx16 -mno-enqcmd -mf16c -mfsgsbase -mfxsr -mno-hle -msahf -mno-lwp -mlzcnt -mmovbe -mno-movdir64b -mno-movdiri -mmwaitx -mno-pconfig -mpku -mprfchw -mno-ptwrite -mrdpid -mrdrnd -mrdseed -mno-rtm -mno-serialize -mno-sgx -msha -mshstk -mno-tbm -mno-tsxldtrk -mvaes -mno-waitpkg -mwbnoinvd -mxsave -mxsavec -mxsaveopt -mxsaves -mno-amx-tile -mno-amx-int8 -mno-amx-bf16 -mno-uintr -mno-hreset -mno-kl -mno-widekl -mno-avxvnni -mno-avxifma -mno-avxvnniint8 -mno-avxneconvert -mno-cmpccxadd -mno-amx-fp16 -mno-prefetchi -mno-raoint -mno-amx-complex --param l1-cache-size=32 --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver3 -fno-optimize-sibling-calls -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATION_WARNINGS -DGLIB_DISABLE_DEPRECATION_WARNINGS -pipe -Wno-pointer-sign -Wno-unused-variable -Wno-unused-label -DPDMP_BASE='\''"emacs-gtk"'\''' LDFLAGS=-Wl,-O2 'CXX=sccache c++' PKG_CONFIG_PATH=:/usr/lib64/pkgconfig:/usr/share/pkgconfig' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Allow-to-store-and-read-repository-information-of-VC.patch >From c5332d1a4a65ad6b124d0919d275c0ddde045842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= Date: Sun, 17 Nov 2024 13:37:21 +0200 Subject: [PATCH] Allow to store and read repository information of VCS builds Store repository information in version file if Emacs is build from source while VCS is present. The version file can also be stored in the Emacs sources prior built to indicate if Emacs was built from VCS sources. An example use case could be if Emacs runs on a system where the version control system isn't available, e.g. similarly as it is intended for Android builds. Another one is to be able to set the VCS information for workers in a CI environment where sources are generated separately from VCS but it or the VCS repository isn't present on the worker. Reuse the same mechanism that exist for Android builds if the version file is present. * Makefile.in (etc-emacsver): Generate etc/version file with revision and branch if git is installed and Emacs sources are VCS sources. * lisp/version.el (emacs-repository-get-branch) (emacs-repository-get-version, emacs-repository-branch-static) (emacs-repository-version-static): Implement static versions that can use the information generated during build if present. --- .gitignore | 1 + Makefile.in | 20 ++++++++++++++++---- lisp/version.el | 44 ++++++++++++++++++++++++++++++++------------ 3 files changed, 49 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index c1f31514d06..d3b737d590c 100644 --- a/.gitignore +++ b/.gitignore @@ -314,6 +314,7 @@ doc/misc/modus-themes.texi doc/misc/org.texi etc/DOC etc/refcards/emacsver.tex +etc/version gnustmp* /info/ diff --git a/Makefile.in b/Makefile.in index 30a762ed03b..202b0417282 100644 --- a/Makefile.in +++ b/Makefile.in @@ -452,7 +452,18 @@ etc-emacsver: sed "s/[@]majorversion@/$${majorversion}/" \ ${srcdir}/etc/refcards/emacsver.tex.in > emacsver.tex.$$$$ && \ ${srcdir}/build-aux/move-if-change emacsver.tex.$$$$ \ - ${srcdir}/etc/refcards/emacsver.tex + ${srcdir}/etc/refcards/emacsver.tex; \ + if [ -e $(srcdir)/.git ] && \ + which git > /dev/null ; then \ + { (cd $(srcdir) \ + && git rev-parse HEAD || echo "Unknown") \ + && (git rev-parse --abbrev-ref HEAD \ + || echo "Unknown") } 2> /dev/null > \ + ${top_builddir}/etc/version.$$$$; \ + ${srcdir}/build-aux/move-if-change \ + ${top_builddir}/etc/version.$$$$ \ + ${top_builddir}/etc/version; \ + else : ;fi # The shared gamedir name as a C string literal, or a null ptr if not in use. PATH_GAME = $(if $(use_gamedir),"$(gamedir)",((char const *) 0)) @@ -627,7 +638,7 @@ install-arch-dep: umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}" $(MAKE) -C lib-src install ifeq (${ns_self_contained},no) - ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" + ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACS)" ifeq (${HAVE_BE_APP},yes) ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/Emacs "$(DESTDIR)${prefix}/apps/Emacs" endif @@ -637,7 +648,7 @@ install-arch-dep: endif ${INSTALL_DATA} src/emacs.pdmp "$(DESTDIR)${libexecdir}/emacs/${version}/${configuration}"/emacs-${EMACS_PDMP} endif - -chmod 755 "$(DESTDIR)${bindir}/$(EMACSFULL)" + -chmod 755 "$(DESTDIR)${bindir}/$(EMACS)" ifndef NO_BIN_LINK rm -f "$(DESTDIR)${bindir}/$(EMACS)" cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) "$(EMACSFULL)" "$(EMACS)" @@ -826,6 +837,7 @@ install-man: umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}" thisdir=`pwd -P`; \ cd ${mansrcdir}; \ + cp ctags.1 gnuctags.1; \ for page in *.1; do \ test "$$page" = ChangeLog.1 && continue; \ dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \ @@ -969,7 +981,7 @@ uninstall: for page in *.1; do \ rm -f "$(DESTDIR)${man1dir}"/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \ fi) - rm -f "$(DESTDIR)${bindir}/$(EMACS)" "$(DESTDIR)${bindir}/$(EMACSFULL)" + rm -f "$(DESTDIR)${bindir}/$(EMACS)" (if cd "$(DESTDIR)${icondir}"; then \ rm -f hicolor/*x*/apps/"${EMACS_NAME}.png" \ "hicolor/scalable/apps/${EMACS_NAME}.svg" \ diff --git a/lisp/version.el b/lisp/version.el index db2afd55694..3b2c91c03dc 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -171,15 +171,21 @@ emacs-repository-version-git (looking-at "[[:xdigit:]]\\{40\\}")) (match-string 0))))) -(defun emacs-repository-version-android () +(defun emacs-repository-version-static (dir) "Return the Emacs repository revision Emacs was built from. Value is nil if Emacs was not built from a repository checkout. -Use information from the `/assets/version' special file." +Use information from the `DIR/version' special file." (with-temp-buffer - (insert-file-contents "/assets/version") + (insert-file-contents (expand-file-name "version" dir)) (let ((string (buffer-substring 1 (line-end-position)))) (and (not (equal string "Unknown")) string)))) +(defun emacs-repository-version-android () + "Return the Emacs repository revision Emacs was built from. +Value is nil if Emacs was not built from a repository checkout. +Use information from the `/assets/version' special file." + (emacs-repository-version-static "/assets")) + (defun emacs-repository-get-version (&optional dir _external) "Try to return as a string the repository revision of the Emacs sources. The format of the returned string is dependent on the VCS in use. @@ -194,9 +200,13 @@ emacs-repository-get-version Optional argument DIR is a directory to use instead of `source-directory'. Optional argument EXTERNAL is ignored." - (cond ((and (featurep 'android) - (eq system-type 'android)) - (emacs-repository-version-android)) + (cond ((and (or (and (featurep 'android) + (eq system-type 'android) + (setq dir "/assets")) + (and (not dir) + (file-exists-p (expand-file-name "version" data-directory)) + (setq dir data-directory))) + (emacs-repository-version-static dir))) (t (emacs-repository-version-git (or dir source-directory))))) @@ -209,8 +219,14 @@ emacs-repository-branch-android "Return the Emacs repository branch Emacs was built from. Value is nil if Emacs was not built from a repository checkout. Use information from the `/assets/version' special file." + (emacs-repository-branch-static "/assets")) + +(defun emacs-repository-branch-static (dir) + "Return the Emacs repository branch Emacs was built from. +Value is nil if Emacs was not built from a repository checkout. +Use information from the `DIR/version' special file." (with-temp-buffer - (insert-file-contents "/assets/version") + (insert-file-contents (expand-file-name "version" dir)) (end-of-line) (forward-char) (let ((string (buffer-substring (point) (line-end-position)))) @@ -232,8 +248,8 @@ emacs-repository-get-branch "Try to return as a string the repository branch of the Emacs sources. The format of the returned string is dependent on the VCS in use. -If Emacs is built for Android, use the version information -embedded in the Emacs installation package. +If Emacs is built for Android or contains version file, +use the version information embedded in the Emacs installation package. Value is nil if the sources do not seem to be under version control, or if we could not determine the branch. Note that @@ -241,9 +257,13 @@ emacs-repository-get-branch correspond to the running Emacs. Optional argument DIR is a directory to use instead of `source-directory'." - (cond ((and (featurep 'android) - (eq system-type 'android)) - (emacs-repository-branch-android)) + (cond ((and (or (and (featurep 'android) + (eq system-type 'android) + (setq dir "/assets")) + (and (not dir) + (file-exists-p (expand-file-name "version" data-directory)) + (setq dir data-directory))) + (emacs-repository-branch-static dir))) (t (emacs-repository-branch-git (or dir source-directory))))) -- 2.45.2 --=-=-=--