From df3c7d515826452457bff19c507fbe0fda06458edb77b5cf27fe44f5d8a54c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 3 Oct 2024 18:13:06 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main git revision 0e96b625338dcd4070f8d2d934213082 --- git-2.46.0.tar.sign | Bin 566 -> 0 bytes git-2.46.0.tar.xz | 3 --- git-2.46.1.tar.sign | Bin 0 -> 566 bytes git-2.46.1.tar.xz | 3 +++ git.changes | 50 ++++++++++++++++++++++++++++++++++++++++++++ git.spec | 2 +- 6 files changed, 54 insertions(+), 4 deletions(-) delete mode 100644 git-2.46.0.tar.sign delete mode 100644 git-2.46.0.tar.xz create mode 100644 git-2.46.1.tar.sign create mode 100644 git-2.46.1.tar.xz diff --git a/git-2.46.0.tar.sign b/git-2.46.0.tar.sign deleted file mode 100644 index 297e5db83f07d5bb40f57a52fd3ead2dffd84535d297877582570ad07f00c074..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c*^jVKUfgUp_1y* z7&hr~XkQeHUby}vlq5w(apqZ(_=I$*i*+akLSWb4r(KjH?! zMf#wn$H06!0vVYd7Kf*rdOU5WfUgk*3QcE92A@tLmkt+JMEEW&!(7vFCkcBAsV+OH zb1PRym~JHh(pNpV+14dwqluZLKg7enM1=snjD}8RK5CF0d1*D{)gT#0T>@M$-Sj#@ zG-rj?v)YeccU~+%A;K6#C7^)1{$-G%Zp*=kx}$7k^S33?z8wVR;E=1U$d<@t^@#-+ zNaLuKeyxxYDYj1_Z$Nm+p<61=y-~9IP%{LPV66l+pDxm$44EaOalsbOi51N(U$XT! z93LMZH9IxTp4=)4;Y-2GOCK5yI*1{Iz4~uGg7RNwiyip6%Sr$2!%*@K@L!^t!)~kf z)50{Qw;Dn;iQ06F=34gXNCO>R?&1VYyu`G<=Xs8=eYGs*uwTT=HdVqwIBq)nH(Gv&4)XRmtjYcC_EiPBT`0_P5FaG@UR73`%b91A_w5f E55^1-a{vGU diff --git a/git-2.46.0.tar.xz b/git-2.46.0.tar.xz deleted file mode 100644 index c54d122..0000000 --- a/git-2.46.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f123462a28b7ca3ebe2607485f7168554c2b10dfc155c7ec46300666ac27f95 -size 7577180 diff --git a/git-2.46.1.tar.sign b/git-2.46.1.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..a344a46ae4ef56392679cde678e75b2152fa9d4e843ad155d58970394a33411d GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+cBBk9MtM zb#m*Ho?UIbw;6{1JA}q=`AI6Gn-`Xf1xLfdr3JPYZrrtH*umOeT8Ud0*Mc9&l8`L+ z0Kups*Fc!N*2tzl1Eg8KZN?3r?6zi6Icxe9nv@%-G4)dUYDU;Fzu-9PEG}guRmHF> zV40QZg7vr^91q9EoswBv@OQ)*iKk}V<@pe|^lQ~f6SY9zf5c0yzA^NJShC>@fnqva E>V}sd1poj5 literal 0 HcmV?d00001 diff --git a/git-2.46.1.tar.xz b/git-2.46.1.tar.xz new file mode 100644 index 0000000..37fd8ed --- /dev/null +++ b/git-2.46.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:888cafb8bd6ab4cbbebc168040a8850eb088f81dc3ac2617195cfc0877f0f543 +size 7582036 diff --git a/git.changes b/git.changes index 0bb526b..504f377 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Fri Sep 20 08:18:30 UTC 2024 - Dominique Leuenberger + +- Update to version 2.46.1; + * "git checkout --ours" (no other arguments) complained that the + option is incompatible with branch switching, which is technically + correct, but found confusing by some users. It now says that the + user needs to give pathspec to specify what paths to checkout. + * It has been documented that we avoid "VAR=VAL shell_func" and why. + * "git add -p" by users with diff.suppressBlankEmpty set to true + failed to parse the patch that represents an unmodified empty line + with an empty line (not a line with a single space on it), which + has been corrected. + * "git rebase --help" referred to "offset" (the difference between + the location a change was taken from and the change gets replaced) + incorrectly and called it "fuzz", which has been corrected. + * "git notes add -m '' --allow-empty" and friends that take prepared + data to create notes should not invoke an editor, but it started + doing so since Git 2.42, which has been corrected. + * An expensive operation to prepare tracing was done in re-encoding + code path even when the tracing was not requested, which has been + corrected. + * Perforce tests have been updated. + * The credential helper to talk to OSX keychain sometimes sent + garbage bytes after the username, which has been corrected. + * A recent update broke "git ls-remote" used outside a repository, + which has been corrected. + * "git config --value=foo --fixed-value section.key newvalue" barfed + when the existing value in the configuration file used the + valueless true syntax, which has been corrected. + * "git reflog expire" failed to honor annotated tags when computing + reachable commits. + * A flakey test and incorrect calls to strtoX() functions have been + fixed. + * Follow-up on 2.45.1 regression fix. + * "git rev-list ... | git diff-tree -p --remerge-diff --stdin" should + behave more or less like "git log -p --remerge-diff" but instead it + crashed, forgetting to prepare a temporary object store needed. + * The patch parser in "git patch-id" has been tightened to avoid + getting confused by lines that look like a patch header in the log + message. + * "git bundle unbundle" outside a repository triggered a BUG() + unnecessarily, which has been corrected. + * The code forgot to discard unnecessary in-core commit buffer data + for commits that "git log --skip=" traversed but omitted + from the output, which has been corrected. + * "git verify-pack" and "git index-pack" started dying outside a + repository, which has been corrected. + * A corner case bug in "git stash" was fixed. + ------------------------------------------------------------------- Wed Aug 28 08:33:45 UTC 2024 - Georg Pfuetzenreuter diff --git a/git.spec b/git.spec index ee9fc6a..760b90a 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %bcond_with asciidoctor %endif Name: git -Version: 2.46.0 +Version: 2.46.1 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0-only