This update for git fixes the following issues:
Security issue fixed:
- CVE-2020-5260: With a crafted URL that contains a newline in it, the credential
helper machinery can be fooled to give credential information for a wrong host (bsc#1168930).
Non-security issue fixed:
git was updated to 2.26.0 for SHA256 support (bsc#1167890, jsc#SLE-11608):
- the xinetd snippet was removed
- the System V init script for the git-daemon was replaced by a systemd
service file of the same name.
git 2.26.0:
- 'git rebase' now uses a different backend that is based on the
'merge' machinery by default. The 'rebase.backend' configuration
variable reverts to old behaviour when set to 'apply'
- Improved handling of sparse checkouts
- Improvements to many commands and internal features
git 2.25.1:
- 'git commit' now honors advise.statusHints
- various updates, bug fixes and documentation updates
git 2.25.0:
- The branch description ('git branch --edit-description') has been
used to fill the body of the cover letters by the format-patch
command; this has been enhanced so that the subject can also be
filled.
- A few commands learned to take the pathspec from the standard input
or a named file, instead of taking it as the command line
arguments, with the '--pathspec-from-file' option.
- Test updates to prepare for SHA-2 transition continues.
- Redo 'git name-rev' to avoid recursive calls.
- When all files from some subdirectory were renamed to the root
directory, the directory rename heuristics would fail to detect that
as a rename/merge of the subdirectory to the root directory, which has
been corrected.
- HTTP transport had possible allocator/deallocator mismatch, which
has been corrected.
git 2.24.1:
- CVE-2019-1348: The --export-marks option of fast-import is
exposed also via the in-stream command feature export-marks=...
and it allows overwriting arbitrary paths (bsc#1158785)
- CVE-2019-1349: on Windows, when submodules are cloned
recursively, under certain circumstances Git could be fooled
into using the same Git directory twice (bsc#1158787)
- CVE-2019-1350: Incorrect quoting of command-line arguments
allowed remote code execution during a recursive clone in
conjunction with SSH URLs (bsc#1158788)
- CVE-2019-1351: on Windows mistakes drive letters outside of
the US-English alphabet as relative paths (bsc#1158789)
- CVE-2019-1352: on Windows was unaware of NTFS Alternate Data
Streams (bsc#1158790)
- CVE-2019-1353: when run in the Windows Subsystem for Linux
while accessing a working directory on a regular Windows
drive, none of the NTFS protections were active (bsc#1158791)
- CVE-2019-1354: on Windows refuses to write tracked files with
filenames that contain backslashes (bsc#1158792)
- CVE-2019-1387: Recursive clones vulnerability that is caused
by too-lax validation of submodule names, allowing very
targeted attacks via remote code execution in recursive
clones (bsc#1158793)
CVE-2019-19604: a recursive clone followed by a submodule
update could execute code contained within the repository
without the user explicitly having asked for that (bsc#1158795)
Fix building with asciidoctor and without DocBook4 stylesheets.
git 2.24.0
- The command line parser learned '--end-of-options' notation.
- A mechanism to affect the default setting for a (related) group of
configuration variables is introduced.
- 'git fetch' learned '--set-upstream' option to help those who first
clone from their private fork they intend to push to, add the true
upstream via 'git remote add' and then 'git fetch' from it.
- fixes and improvements to UI, workflow and features, bash completion fixes
- part of it merged upstream
- the Makefile attempted to download some documentation, banned
git 2.23.0:
- The '--base' option of 'format-patch' computed the patch-ids for
prerequisite patches in an unstable way, which has been updated
to compute in a way that is compatible with 'git patch-id
--stable'.
- The 'git log' command by default behaves as if the --mailmap
option was given.
- fixes and improvements to UI, workflow and features
git 2.22.1:
- A relative pathname given to 'git init --template=<path> <repo>'
ought to be relative to the directory 'git init' gets invoked in,
but it instead was made relative to the repository, which has been
corrected.
- 'git worktree add' used to fail when another worktree connected to
the same repository was corrupt, which has been corrected.
- 'git am -i --resolved' segfaulted after trying to see a commit as
if it were a tree, which has been corrected.
- 'git merge --squash' is designed to update the working tree and the
index without creating the commit, and this cannot be countermanded
by adding the '--commit' option; the command now refuses to work
when both options are given.
- Update to Unicode 12.1 width table.
- 'git request-pull' learned to warn when the ref we ask them to pull
from in the local repository and in the published repository are
different.
- 'git fetch' into a lazy clone forgot to fetch base objects that are
necessary to complete delta in a thin packfile, which has been
corrected.
- The URL decoding code has been updated to avoid going past the end
of the string while parsing %-<hex>-<hex> sequence.
- 'git clean' silently skipped a path when it cannot lstat() it; now
it gives a warning.
- 'git rm' to resolve a conflicted path leaked an internal message
'needs merge' before actually removing the path, which was
confusing. This has been corrected.
Many more bugfixes and code cleanups.
removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
firewalld, see [1].
git 2.22.0:
The filter specification '--filter=sparse:path=<path>' used to
create a lazy/partial clone has been removed. Using a blob that is
part of the project as sparse specification is still supported with
the '--filter=sparse:oid=<blob>' option
- 'git checkout --no-overlay' can be used to trigger a new mode of
checking out paths out of the tree-ish, that allows paths that
match the pathspec that are in the current index and working tree
and are not in the tree-ish.
- Four new configuration variables {author,committer}.{name,email}
have been introduced to override user.{name,email} in more specific
cases.
- 'git branch' learned a new subcommand '--show-current'.
- The command line completion (in contrib/) has been taught to
complete more subcommand parameters.
- The completion helper code now pays attention to repository-local
configuration (when available), which allows --list-cmds to honour
a repository specific setting of completion.commands, for example.
- The list of conflicted paths shown in the editor while concluding a
conflicted merge was shown above the scissors line when the
clean-up mode is set to 'scissors', even though it was commented
out just like the list of updated paths and other information to
help the user explain the merge better.
- 'git rebase' that was reimplemented in C did not set ORIG_HEAD
correctly, which has been corrected.
'git worktree add' used to do a 'find an available name with stat
and then mkdir', which is race-prone. This has been fixed by using
mkdir and reacting to EEXIST in a loop.
update git-web AppArmor profile for bash and tar usrMerge (bsc#1132350)
git 2.21.0:
- Historically, the '-m' (mainline) option can only be used for 'git
cherry-pick' and 'git revert' when working with a merge commit.
This version of Git no longer warns or errors out when working with
a single-parent commit, as long as the argument to the '-m' option
is 1 (i.e. it has only one parent, and the request is to pick or
revert relative to that first parent). Scripts that relied on the
behaviour may get broken with this change.
- Small fixes and features for fast-export and fast-import.
- The 'http.version' configuration variable can be used with recent
enough versions of cURL library to force the version of HTTP used
to talk when fetching and pushing.
- 'git push $there $src:$dst' rejects when $dst is not a fully
qualified refname and it is not clear what the end user meant.
- Update 'git multimail' from the upstream.
A new date format '--date=human' that morphs its output depending
on how far the time is from the current time has been introduced.
'--date=auto:human' can be used to use this new format (or any
existing format) when the output is going to the pager or to the
terminal, and otherwise the default format.
Fix worktree creation race (bsc#1114225).
git 2.20.1:
- portability fixes
- 'git help -a' did not work well when an overly long alias was
defined
- no longer squelched an error message when the run_command API
failed to run a missing command
git 2.20.0:
git 2.19.2:
- various bug fixes for multiple subcommands and operations
git 2.19.1:
- CVE-2018-17456: Specially crafted .gitmodules files may have
allowed arbitrary code execution when the repository is cloned
with --recurse-submodules (bsc#1110949)
git 2.19.0:
- 'git diff' compares the index and the working tree. For paths
added with intent-to-add bit, the command shows the full contents
of them as added, but the paths themselves were not marked as new
files. They are now shown as new by default.
- 'git apply' learned the '--intent-to-add' option so that an
otherwise working-tree-only application of a patch will add new
paths to the index marked with the 'intent-to-add' bit.
- 'git grep' learned the '--column' option that gives not just the
line number but the column number of the hit.
- The '-l' option in 'git branch -l' is an unfortunate short-hand for
'--create-reflog', but many users, both old and new, somehow expect
it to be something else, perhaps '--list'. This step warns when '-l'
is used as a short-hand for '--create-reflog' and warns about the
future repurposing of the it when it is used.
- The userdiff pattern for .php has been updated.
- The content-transfer-encoding of the message 'git send-email' sends
out by default was 8bit, which can cause trouble when there is an
overlong line to bust RFC 5322/2822 limit. A new option 'auto' to
automatically switch to quoted-printable when there is such a line
in the payload has been introduced and is made the default.
- 'git checkout' and 'git worktree add' learned to honor
checkout.defaultRemote when auto-vivifying a local branch out of a
remote tracking branch in a repository with multiple remotes that
have tracking branches that share the same names.
(merge 8d7b558bae ab/checkout-default-remote later to maint).
- 'git grep' learned the '--only-matching' option.
- 'git rebase --rebase-merges' mode now handles octopus merges as
well.
- Add a server-side knob to skip commits in exponential/fibbonacci
stride in an attempt to cover wider swath of history with a smaller
number of iterations, potentially accepting a larger packfile
transfer, instead of going back one commit a time during common
ancestor discovery during the 'git fetch' transaction.
(merge 42cc7485a2 jt/fetch-negotiator-skipping later to maint).
- A new configuration variable core.usereplacerefs has been added,
primarily to help server installations that want to ignore the
replace mechanism altogether.
- Teach 'git tag -s' etc. a few configuration variables (gpg.format
that can be set to 'openpgp' or 'x509', and gpg.<format>.program
that is used to specify what program to use to deal with the format)
to allow x.509 certs with CMS via 'gpgsm' to be used instead of
openpgp via 'gnupg'.
- Many more strings are prepared for l10n.
- 'git p4 submit' learns to ask its own pre-submit hook if it should
continue with submitting.
- The test performed at the receiving end of 'git push' to prevent
bad objects from entering repository can be customized via
receive.fsck.* configuration variables; we now have gained a
counterpart to do the same on the 'git fetch' side, with
fetch.fsck.* configuration variables.
- 'git pull --rebase=interactive' learned 'i' as a short-hand for
'interactive'.
- 'git instaweb' has been adjusted to run better with newer Apache on
RedHat based distros.
- 'git range-diff' is a reimplementation of 'git tbdiff' that lets us
compare individual patches in two iterations of a topic.
- The sideband code learned to optionally paint selected keywords at
the beginning of incoming lines on the receiving end.
- 'git branch --list' learned to take the default sort order from the
'branch.sort' configuration variable, just like 'git tag --list'
pays attention to 'tag.sort'.
- 'git worktree' command learned '--quiet' option to make it less
verbose.
git 2.18.0:
- improvements to rename detection logic
- When built with more recent cURL, GITSSLVERSION can now
specify 'tlsv1.3' as its value.
- 'git mergetools' learned talking to guiffy.
- various other workflow improvements and fixes
- performance improvements and other developer visible fixes
Update to git 2.16.4: security fix release
git 2.17.1:
- Submodule 'names' come from the untrusted .gitmodules file, but
we blindly append them to $GIT_DIR/modules to create our on-disk
repo paths. This means you can do bad things by putting '../'
into the name. We now enforce some rules for submodule names
which will cause Git to ignore these malicious names
(CVE-2018-11235, bsc#1095219)
- It was possible to trick the code that sanity-checks paths on
NTFS into reading random piece of memory
(CVE-2018-11233, bsc#1095218)
- Support on the server side to reject pushes to repositories
that attempt to create such problematic .gitmodules file etc.
as tracked contents, to help hosting sites protect their
customers by preventing malicious contents from spreading.
git 2.17.0:
- 'diff' family of commands learned '--find-object=<object-id>' option
to limit the findings to changes that involve the named object.
- 'git format-patch' learned to give 72-cols to diffstat, which is
consistent with other line length limits the subcommand uses for
its output meant for e-mails.
- The log from 'git daemon' can be redirected with a new option; one
relevant use case is to send the log to standard error (instead of
syslog) when running it from inetd.
- 'git rebase' learned to take '--allow-empty-message' option.
- 'git am' has learned the '--quit' option, in addition to the
existing '--abort' option; having the pair mirrors a few other
commands like 'rebase' and 'cherry-pick'.
- 'git worktree add' learned to run the post-checkout hook, just like
'git clone' runs it upon the initial checkout.
- 'git tag' learned an explicit '--edit' option that allows the
message given via '-m' and '-F' to be further edited.
- 'git fetch --prune-tags' may be used as a handy short-hand for
getting rid of stale tags that are locally held.
- The new '--show-current-patch' option gives an end-user facing way
to get the diff being applied when 'git rebase' (and 'git am')
stops with a conflict.
- 'git add -p' used to offer '/' (look for a matching hunk) as a
choice, even there was only one hunk, which has been corrected.
Also the single-key help is now given only for keys that are
enabled (e.g. help for '/' won't be shown when there is only one
hunk).
- Since Git 1.7.9, 'git merge' defaulted to --no-ff (i.e. even when
the side branch being merged is a descendant of the current commit,
create a merge commit instead of fast-forwarding) when merging a
tag object. This was appropriate default for integrators who pull
signed tags from their downstream contributors, but caused an
unnecessary merges when used by downstream contributors who
habitually 'catch up' their topic branches with tagged releases
from the upstream. Update 'git merge' to default to --no-ff only
when merging a tag object that does not sit at its usual place in
refs/tags/ hierarchy, and allow fast-forwarding otherwise, to
mitigate the problem.
- 'git status' can spend a lot of cycles to compute the relation
between the current branch and its upstream, which can now be
disabled with '--no-ahead-behind' option.
- 'git diff' and friends learned funcname patterns for Go language
source files.
- 'git send-email' learned '--reply-to=<address>' option.
- Funcname pattern used for C# now recognizes 'async' keyword.
- In a way similar to how 'git tag' learned to honor the pager
setting only in the list mode, 'git config' learned to ignore the
pager setting when it is used for setting values (i.e. when the
purpose of the operation is not to 'show').
- Use %license instead of %doc [bsc#1082318]
git 2.16.3:
- 'git status' after moving a path in the working tree (hence
making it appear 'removed') and then adding with the -N option
(hence making that appear 'added') detected it as a rename, but
did not report the old and new pathnames correctly.
- 'git commit --fixup' did not allow '-m<message>' option to be
used at the same time; allow it to annotate resulting commit
with more text.
- When resetting the working tree files recursively, the working
tree of submodules are now also reset to match.
- Fix for a commented-out code to adjust it to a rather old API
change around object ID.
- When there are too many changed paths, 'git diff' showed a
warning message but in the middle of a line.
- The http tracing code, often used to debug connection issues,
learned to redact potentially sensitive information from its
output so that it can be more safely sharable.
- Crash fix for a corner case where an error codepath tried to
unlock what it did not acquire lock on.
- The split-index mode had a few corner case bugs fixed.
- Assorted fixes to 'git daemon'.
- Completion of 'git merge -s<strategy>' (in contrib/) did not
work well in non-C locale.
- Workaround for segfault with more recent versions of SVN.
- Recently introduced leaks in fsck have been plugged.
Travis CI integration now builds the executable in 'script'
phase to follow the established practice, rather than during
'before_script' phase. This allows the CI categorize the
failures better ('failed' is project's fault, 'errored' is
build environment's).
Drop superfluous xinetd snippet, no longer used (bsc#1084460)
Build with asciidoctor for the recent distros (bsc#1075764)
Move %{?systemd_requires} to daemon subpackage
- Create subpackage for libsecret credential helper.
git 2.16.2:
- An old regression in 'git describe --all $annotated_tag^0' has
been fixed.
- 'git svn dcommit' did not take into account the fact that a
svn+ssh:// URL with a username@ (typically used for pushing)
refers to the same SVN repository without the username@ and
failed when svn.pushmergeinfo option is set.
- 'git merge -Xours/-Xtheirs' learned to use our/their version
when resolving a conflicting updates to a symbolic link.
- 'git clone $there $here' is allowed even when here directory
exists as long as it is an empty directory, but the command
incorrectly removed it upon a failure of the operation.
- 'git stash -- <pathspec>' incorrectly blew away untracked files
in the directory that matched the pathspec, which has been
corrected.
- 'git add -p' was taught to ignore local changes to submodules
as they do not interfere with the partial addition of regular
changes anyway.
git 2.16.1:
- 'git clone' segfaulted when cloning a project that happens to
track two paths that differ only in case on a case insensitive
filesystem
git 2.16.0 (CVE-2017-15298, bsc#1063412):
- See https://raw.github.com/git/git/master/Documentation/RelNotes/2.16.0.txt
git 2.15.1:
- fix 'auto' column output
- fixes to moved lines diffing
- documentation updates
- fix use of repositories immediately under the root directory
- improve usage of libsecret
fixes to various error conditions in git commands
Rewrite from sysv init to systemd unit file for git-daemon
(bsc#1069803)
Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (bsc#1069468)
split off p4 to a subpackage (bsc#1067502)
Build with the external libsha1detectcoll (bsc#1042644)
git 2.15.0:
- Use of an empty string as a pathspec element that is used for
'everything matches' is still warned and Git asks users to use a
more explicit '.' for that instead. Removal scheduled for 2.16
- Git now avoids blindly falling back to '.git' when the setup
sequence said we are not in Git repository (another corner
case removed)
- 'branch --set-upstream' was retired, deprecated since 1.8
- many other improvements and updates
git 2.14.3:
- git send-email understands more cc: formats
- fixes so gitk --bisect
- git commit-tree fixed to handle -F file alike
- Prevent segfault in 'git cat-file --textconv'
- Fix function header parsing for HTML
- Various small fixes to user commands and and internal functions
git 2.14.2:
- fixes to color output
- http.{sslkey,sslCert} now interpret '~[username]/' prefix
- fixes to walking of reflogs via 'log -g' and friends
- various fixes to output correctness
- 'git push --recurse-submodules $there HEAD:$target' is now
propagated down to the submodules
- 'git clone --recurse-submodules --quiet' c$how propagates quiet
option down to submodules.
- 'git svn --localtime' correctness fixes
- 'git grep -L' and 'git grep --quiet -L' now report same exit code
- fixes to 'git apply' when converting line endings
- Various Perl scripts did not use safepipecapture() instead
of backticks, leaving them susceptible to end-user input.
CVE-2017-14867 bsc#1061041
- 'git cvsserver' no longer is invoked by 'git daemon' by
default
git 2.14.1 (bsc#1052481):
* Security fix for CVE-2017-1000117: A malicious third-party can
give a crafted 'ssh://...' URL to an unsuspecting victim, and
an attempt to visit the URL can result in any program that
exists on the victim's machine being executed. Such a URL could
be placed in the .gitmodules file of a malicious project, and
an unsuspecting victim could be tricked into running
'git clone --recurse-submodules' to trigger the vulnerability.
* A 'ssh://...' URL can result in a 'ssh' command line with a
hostname that begins with a dash '-', which would cause the
'ssh' command to instead (mis)treat it as an option. This is
now prevented by forbidding such a hostname (which should not
impact any real-world usage).
* Similarly, when GITPROXYCOMMAND is configured, the command
is run with host and port that are parsed out from 'ssh://...'
URL; a poorly written GITPROXYCOMMAND could be tricked into
treating a string that begins with a dash '-' as an option.
This is now prevented by forbidding such a hostname and port
number (again, which should not impact any real-world usage).
* In the same spirit, a repository name that begins with a dash
'-' is also forbidden now.
git 2.14.0:
- Use of an empty string as a pathspec element that is used for
'everything matches' is deprecated, use '.'
- Avoid blindly falling back to '.git' when the setup sequence
indicates operation not on a Git repository
- 'indent heuristics' are now the default.
- Builds with pcre2
- Many bug fixes, improvements and updates
git 2.13.4:
- Update the character width tables.
- Fix an alias that contained an uppercase letter
- Progress meter fixes
- git gc concurrency fixes
git 2.13.3:
- various internal bug fixes
- Fix a regression to 'git rebase -i'
- Correct unaligned 32-bit access in pack-bitmap code
- Tighten error checks for invalid 'git apply' input
- The split index code did not honor core.sharedrepository setting
correctly
- Fix 'git branch --list' handling of color.branch.local
git 2.13.2:
- 'collision detecting' SHA-1 update for platform fixes
- 'git checkout --recurse-submodules' did not quite work with a
submodule that itself has submodules.
- The 'run-command' API implementation has been made more robust
against dead-locking in a threaded environment.
- 'git clean -d' now only cleans ignored files with '-x'
- 'git status --ignored' did not list ignored and untracked files
without '-uall'
- 'git pull --rebase --autostash' didn't auto-stash when the local
history fast-forwards to the upstream.
- 'git describe --contains' gives as much weight to lightweight
tags as annotated tags
- Fix 'git stash push <pathspec>' from a subdirectory
git 2.13.1:
git 2.13.0:
- empty string as a pathspec element for 'everything matches'
is still warned, for future removal.
- deprecated argument order 'git merge <msg> HEAD <commit>...'
was removed
- default location '~/.git-credential-cache/socket' for the
socket used to communicate with the credential-cache daemon
moved to '~/.cache/git/credential/socket'.
- now avoid blindly falling back to '.git' when the setup
sequence indicated otherwise
- many workflow features, improvements and bug fixes
- add a hardened implementation of SHA1 in response to practical
collision attacks (CVE-2005-4900, bsc#1042640)
- CVE-2017-8386: On a server running git-shell as login shell to
restrict user to git commands, remote users may have been able
to have git service programs spawn an interactive pager
and thus escape the shell restrictions. (bsc#1038395)
Changes in pcre2:
Include the libraries, development and tools packages.
git uses only libpcre2-8 so far, but this allows further
application usage of pcre2.