From 54e2cafb0cb1351436ae53aa53749321a398e10df62abb5f4e78a4f724cfa95d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 1 Feb 2022 13:02:42 +0000 Subject: [PATCH] Accepting request 949887 from devel:tools:scm OBS-URL: https://build.opensuse.org/request/show/949887 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=273 --- git-2.34.1.tar.sign | Bin 566 -> 0 bytes git-2.34.1.tar.xz | 3 -- git-2.35.1.tar.sign | Bin 0 -> 566 bytes git-2.35.1.tar.xz | 3 ++ git.changes | 72 ++++++++++++++++++++++++++++++++++++++++++++ git.spec | 4 +-- 6 files changed, 77 insertions(+), 5 deletions(-) delete mode 100644 git-2.34.1.tar.sign delete mode 100644 git-2.34.1.tar.xz create mode 100644 git-2.35.1.tar.sign create mode 100644 git-2.35.1.tar.xz diff --git a/git-2.34.1.tar.sign b/git-2.34.1.tar.sign deleted file mode 100644 index 22c648c018e87f33cc1a72c1c27e81290a3cdb41011abc60232a9504efbeee49..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+crUXAhcu7-Q#J@>XaxQDk zC=QVT&&*?-5|VyA#QgD2RyJX=-!?_1REl*_{9?+HPuM1wb%A-~OK8hH!v}ijB4RxJ zBf8ACmslW36BC)KFTm+qgoy+L+-(Q4))&ikvDn6*Gm|lhxf3uBNI9rE_&1swq-wfm z2Mm7U69f!oejG3yO0p?MZrp}^qv^u^`_pwgmfZipGX*<#caicNBBOxzkM9d0LP3b2 z3!OG)>$()lx}KiEGBSuKvV4J(VT3%hVMG-G>`@>2e2v|sHb~P-}CVznR4rTTx6at zolmZLvxT$lHJh4>(hwOZ>=5*I9~8bwP8FpV-b_PI(txlxDm&*-7!f53P~9>WoeGtLH^W`XD_Yks2cegz}|*@<&Pda+o$W%Rr=9?NMLG3qIn? EhG;Je%>V!Z diff --git a/git-2.34.1.tar.xz b/git-2.34.1.tar.xz deleted file mode 100644 index 6f7e8b2..0000000 --- a/git-2.34.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a0755dd1cfab71a24dd96df3498c29cd0acd13b04f3d08bf933e81286db802c -size 6623760 diff --git a/git-2.35.1.tar.sign b/git-2.35.1.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..446257882daffe63d61f4afb63d8b02348b3958f3d02abe56ec4a0335a8f2c1f GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c8&7kr}>_TW)%BXMrVz zT?j$d!k2MHqSJp&0OC5AnX_^o(FeUM9CylCi(0jbt3`EK~RBDLK>)=3cqu*c4yQRFnG4a7xq_`(bHV z2FdCnQk6k^upt0att7hd2?iI3N=y2gWy_CRUkyAEpY!esm^NM|a;19C)9tMcwn~pl z-cL#IMkukcEuAw&ly!c(t}ca8#_L52SE&C%nBE|l-HdqpL)KB&rtRr*NbvTQ8nOf+ zInaZ?p~#FHUw#C+KBIY#c=p&y3$vD8eScKWDZyjy=Vaub|LuvY`$Q?6B`=Bqkotx( z&{DkC8^bFaJeoHcYx9Kl>P5O9(P-KSK#0zcSPpE8`F`-B78>fwS?n4m)V|+dM?Z%E zcnLK=Lq_nEg(NYu+geie^u>@j*S3*OpXC~OKHx=#dfiNtmwmNe_Sf|>Jq9rF*}Ml0>Myv_=;Y#wh->rr%X_MS1{54ML5;|x-1 zak;KmY&$ literal 0 HcmV?d00001 diff --git a/git-2.35.1.tar.xz b/git-2.35.1.tar.xz new file mode 100644 index 0000000..63593a4 --- /dev/null +++ b/git-2.35.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d768528e6443f65a203036266f1ca50f9d127ba89751e32ead37117ed9191080 +size 6874520 diff --git a/git.changes b/git.changes index 41d493f..c948685 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Sat Jan 29 08:19:27 UTC 2022 - Andreas Stieger + +- update to 2.35.1: + * fix "rebase" and "stash" in a secondary worktree + +------------------------------------------------------------------- +Fri Jan 28 20:44:04 UTC 2022 - Dirk Müller + +- update to 2.35.0: + * "_" is now treated as any other URL-valid characters in an URL when + matching the per-URL configuration variable names. + * The color palette used by "git grep" has been updated to match that + of GNU grep. + * "git status --porcelain=v2" now show the number of stash entries + with --show-stash like the normal output does. + * "git stash" learned the "--staged" option to stash away what has + been added to the index (and nothing else). + * "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for + the newly created branch if "git init" is run. + * Various operating modes of "git reset" have been made to work + better with the sparse index. + * "git submodule deinit" for a submodule whose .git metadata + directory is embedded in its working tree refused to work, until + the submodule gets converted to use the "absorbed" form where the + metadata directory is stored in superproject, and a gitfile at the + top-level of the working tree of the submodule points at it. The + command is taught to convert such submodules to the absorbed form + as needed. + * The completion script (in contrib/) learns that the "--date" + option of commands from the "git log" family takes "human" and + "auto" as valid values. + * "Zealous diff3" style of merge conflict presentation has been added. + * The "git log --format=%(describe)" placeholder has been extended to + allow passing selected command-line options to the underlying "git + describe" command. + * "default" and "reset" have been added to our color palette. + * The cryptographic signing using ssh keys can specify literal keys + for keytypes whose name do not begin with the "ssh-" prefix by + using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256"). + * "git fetch" without the "--update-head-ok" option ought to protect + a checked out branch from getting updated, to prevent the working + tree that checks it out to go out of sync. The code was written + before the use of "git worktree" got widespread, and only checked + the branch that was checked out in the current worktree, which has + been updated. + * "git name-rev" has been tweaked to give output that is shorter and + easier to understand. + * "git apply" has been taught to ignore a message without a patch + with the "--allow-empty" option. It also learned to honor the + "--quiet" option given from the command line. + * The "init" and "set" subcommands in "git sparse-checkout" have been + unified for a better user experience and performance. + * Many git commands that deal with working tree files try to remove a + directory that becomes empty (i.e. "git switch" from a branch that + has the directory to another branch that does not would attempt + remove all files in the directory and the directory itself). This + drops users into an unfamiliar situation if the command was run in + a subdirectory that becomes subject to removal due to the command. + The commands have been taught to keep an empty directory if it is + the directory they were started in to avoid surprising users. + * "git am" learns "--empty=(stop|drop|keep)" option to tweak what is + done to a piece of e-mail without a patch in it. + * The default merge message prepared by "git merge" records the name + of the current branch; the name can be overridden with a new option + to allow users to pretend a merge is made on a different branch. + * The way "git p4" shows file sizes in its output has been updated to + use human-readable units. + * "git -c branch.autosetupmerge=inherit branch new old" makes "new" + to have the same upstream as the "old" branch, instead of marking + "old" itself as its upstream. + ------------------------------------------------------------------- Fri Nov 26 21:20:00 UTC 2021 - Dirk Müller diff --git a/git.spec b/git.spec index ca97fd4..9c943a6 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # # spec file for package git # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,7 +36,7 @@ %bcond_with asciidoctor %endif Name: git -Version: 2.34.1 +Version: 2.35.1 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0-only