diff --git a/.abf.yml b/.abf.yml index 467c83c..8a2e1d9 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - git-2.29.0.tar.xz: 9c4d5f611718075a78fcc8b8d26cf6e2cb774ea9 + git-2.45.1.tar.xz: 57f24bccdfc972c64623caa6d3e818f2513d041e diff --git a/93git-branch.sh b/93git-branch.sh index ef42c1c..ddc7b0d 100644 --- a/93git-branch.sh +++ b/93git-branch.sh @@ -1,5 +1,6 @@ # Include the current git branch in the prompt +. /usr/share/bash-completion/completions/git-prompt if type __git_ps1 &>/dev/null; then export PS1="$(echo -n "$PS1" | sed "s|\\\W\]|\\\W\$(type __git_ps1 \&>/dev/null \&\& __git_ps1 \" (%s)\")\]|")" fi diff --git a/git.spec b/git.spec index 0ddf0a2..2198b2a 100644 --- a/git.spec +++ b/git.spec @@ -1,3 +1,4 @@ +%global debug_package %nil %define devname %mklibname git -d %define profile_branch 93git-branch.sh %define profile_env 93git-env.sh @@ -6,7 +7,7 @@ Summary: Global Information Tracker Name: git -Version: 2.29.0 +Version: 2.45.1 Release: 1 Epoch: 1 License: GPLv2+ @@ -30,6 +31,7 @@ Requires: git-core = %{EVRD} Requires: git-svn = %{EVRD} Requires: git-email = %{EVRD} Recommends: gitk = %{EVRD} +Recommends: git-scalar = %{EVRD} Recommends: git-arch = %{EVRD} Recommends: git-core-oldies = %{EVRD} Recommends: git-cvs = %{EVRD} @@ -86,25 +88,9 @@ repositories from other VCS. %exclude %{_libdir}/git-core/*email* %{_datadir}/git-core %{_datadir}/git-gui -%{_mandir}/*/git-* -%{_mandir}/*/git.* -%{_mandir}/*/gitattributes* -%{_mandir}/*/gitignore* -%{_mandir}/*/gitmodules* -%{_mandir}/*/gitnamespaces* -%{_mandir}/*/gitcli* -%{_mandir}/*/githooks* -%{_mandir}/*/gitrepository* -%{_mandir}/*/gitremote-helpers* -%{_mandir}/*/*tutorial* -%{_mandir}/*/*glossary* -%{_mandir}/*/giteveryday* -%{_mandir}/*/gitdiffcore* -%{_mandir}/*/gitworkflows* -%{_mandir}/*/gitrevisions* -%{_mandir}/*/gitcredentials* -%{_mandir}/man7/gitsubmodules.7* -%{_mandir}/man7/gitfaq.7.* +%{_mandir}/man7/git*.7.* +%{_mandir}/man1/git*.1.* +%{_mandir}/man5/git*.5.* %exclude %{_mandir}/man1/*svn*.1* %exclude %{_mandir}/man1/*cvs*.1* %exclude %{_mandir}/man7/*cvs*.7* @@ -113,6 +99,40 @@ repositories from other VCS. #---------------------------------------------------------------------------- +%package scalar +Summary: Tools for git scalability +Group: Development/Tools +Requires: git-core = %{EVRD} + +%description scalar +Scalar is a tool that helps Git scale to some of the largest Git repositories. +It achieves this by enabling some advanced Git features, such as: + +* Partial clone: reduces time to get a working repository by not downloading + all Git objects right away. + +* Background prefetch: downloads Git object data from all remotes every + hour, reducing the amount of time for foreground git fetch calls. + +* Sparse-checkout: limits the size of your working directory. + +* File system monitor: tracks the recently modified files and eliminates + the need for Git to scan the entire worktree. + +* Commit-graph: accelerates commit walks and reachability calculations, + speeding up commands like git log. + +* Multi-pack-index: enables fast object lookups across many pack-files. + +* Incremental repack: Repacks the packed Git data into fewer pack-file + without disrupting concurrent commands by using the multi-pack-index. + +%files scalar +%{_bindir}/scalar +%{_mandir}/man1/scalar.1* + +#---------------------------------------------------------------------------- + %package -n gitk Summary: Git revision tree visualiser Group: Development/Other @@ -207,6 +227,7 @@ Git tools for sending email. %files -n git-email %{_libdir}/git-core/*email* %{_mandir}/man1/*email*.1* +%{_mandir}/man5/gitmailmap.5.* #---------------------------------------------------------------------------- @@ -369,7 +390,8 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_bra %find_lang %{name} %check -GIT_SKIP_TESTS="t9001 t9902" +# t9502 t9501 t9500 gitweb test need internet connection +GIT_SKIP_TESTS="t9001 t9902 t9500 t9501 t9502" %ifarch aarch64 %{arm} %{power64} # Skip tests which fail on aarch64, arm, and ppc #