diff --git a/.git.metadata b/.git.metadata index fbc330a..e39855e 100644 --- a/.git.metadata +++ b/.git.metadata @@ -1,2 +1,2 @@ -bdb5eb6c014d7c372be70782a5155d964abe2c08 SOURCES/git-2.26.2.tar.xz +996c0be58e901deb4ef9d0145e7bf98cdf6a0fb3 SOURCES/git-2.27.0.tar.xz 097b8da13939ac9f51f97a5659184c1d96fb0973 SOURCES/gpgkey-junio.asc diff --git a/.gitignore b/.gitignore index f6f9596..e3e9c6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/git-2.26.2.tar.xz +SOURCES/git-2.27.0.tar.xz SOURCES/gpgkey-junio.asc diff --git a/SOURCES/0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch b/SOURCES/0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch deleted file mode 100644 index c45a8c3..0000000 --- a/SOURCES/0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 68e7090f31b4d4f2c7b9a25240af61149fbebb5c Mon Sep 17 00:00:00 2001 -From: Alban Gruin -Date: Mon, 30 Mar 2020 14:42:35 +0200 -Subject: [PATCH 1/2] sequencer: don't abbreviate a command if it doesn't have - a short form - -When the sequencer is requested to abbreviate commands, it will replace -those that do not have a short form (eg. `noop') by a comment mark. -`noop' serves no purpose, except when fast-forwarding (ie. by running -`git rebase'). Removing it will break this command when -`rebase.abbreviateCommands' is set to true. - -Teach todo_list_to_strbuf() to check if a command has an actual -short form, and to ignore it if not. - -Signed-off-by: Alban Gruin -Signed-off-by: Junio C Hamano ---- - sequencer.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/sequencer.c b/sequencer.c -index e528225e78..c2f97f94ba 100644 ---- a/sequencer.c -+++ b/sequencer.c -@@ -1564,7 +1564,7 @@ static const char *command_to_string(const enum todo_command command) - - static char command_to_char(const enum todo_command command) - { -- if (command < TODO_COMMENT && todo_command_info[command].c) -+ if (command < TODO_COMMENT) - return todo_command_info[command].c; - return comment_line_char; - } -@@ -4947,6 +4947,8 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis - max = num; - - for (item = todo_list->items, i = 0; i < max; i++, item++) { -+ char cmd; -+ - /* if the item is not a command write it and continue */ - if (item->command >= TODO_COMMENT) { - strbuf_addf(buf, "%.*s\n", item->arg_len, -@@ -4955,8 +4957,9 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis - } - - /* add command to the buffer */ -- if (flags & TODO_LIST_ABBREVIATE_CMDS) -- strbuf_addch(buf, command_to_char(item->command)); -+ cmd = command_to_char(item->command); -+ if ((flags & TODO_LIST_ABBREVIATE_CMDS) && cmd) -+ strbuf_addch(buf, cmd); - else - strbuf_addstr(buf, command_to_string(item->command)); - --- -2.26.0 diff --git a/SOURCES/0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch b/SOURCES/0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch deleted file mode 100644 index 019c35b..0000000 --- a/SOURCES/0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch +++ /dev/null @@ -1,63 +0,0 @@ -From de9f1d3ef45ec885339d04f9e34293eb2de8605d Mon Sep 17 00:00:00 2001 -From: Alban Gruin -Date: Mon, 30 Mar 2020 14:42:36 +0200 -Subject: [PATCH 2/2] t3432: test `--merge' with `rebase.abbreviateCommands = - true', too - -When fast forwarding, `git --merge' should act the same whether -`rebase.abbreviateCommands' is set or not, but so far it was not the -case. This duplicates the tests ensuring that `--merge' works when fast -forwarding to check if it also works with abbreviated commands. - -Signed-off-by: Alban Gruin -Signed-off-by: Junio C Hamano ---- - t/t3432-rebase-fast-forward.sh | 24 +++++++++++++++++++----- - 1 file changed, 19 insertions(+), 5 deletions(-) - -diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh -index 6c9d4a1375..6f0452c0ea 100755 ---- a/t/t3432-rebase-fast-forward.sh -+++ b/t/t3432-rebase-fast-forward.sh -@@ -28,10 +28,12 @@ test_rebase_same_head () { - shift && - cmp_f="$1" && - shift && -- test_rebase_same_head_ $status_n $what_n $cmp_n " --apply" "$*" && -- test_rebase_same_head_ $status_f $what_f $cmp_f " --apply --no-ff" "$*" -- test_rebase_same_head_ $status_n $what_n $cmp_n " --merge" "$*" && -- test_rebase_same_head_ $status_f $what_f $cmp_f " --merge --no-ff" "$*" -+ test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --apply" "$*" && -+ test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --apply --no-ff" "$*" -+ test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --merge" "$*" && -+ test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --merge --no-ff" "$*" -+ test_rebase_same_head_ $status_n $what_n $cmp_n 1 " --merge" "$*" && -+ test_rebase_same_head_ $status_f $what_f $cmp_f 1 " --merge --no-ff" "$*" - } - - test_rebase_same_head_ () { -@@ -41,9 +43,21 @@ test_rebase_same_head_ () { - shift && - cmp="$1" && - shift && -+ abbreviate="$1" && -+ shift && - flag="$1" - shift && -- test_expect_$status "git rebase$flag $* with $changes is $what with $cmp HEAD" " -+ if test $abbreviate -eq 1 -+ then -+ msg="git rebase$flag $* (rebase.abbreviateCommands = true) with $changes is $what with $cmp HEAD" -+ else -+ msg="git rebase$flag $* with $changes is $what with $cmp HEAD" -+ fi && -+ test_expect_$status "$msg" " -+ if test $abbreviate -eq 1 -+ then -+ test_config rebase.abbreviateCommands true -+ fi && - oldhead=\$(git rev-parse HEAD) && - test_when_finished 'git reset --hard \$oldhead' && - cp .git/logs/HEAD expect && --- -2.26.0 diff --git a/SOURCES/git-2.26.2.tar.sign b/SOURCES/git-2.26.2.tar.sign deleted file mode 100644 index 3e9121b..0000000 Binary files a/SOURCES/git-2.26.2.tar.sign and /dev/null differ diff --git a/SOURCES/git-2.26.2-core-crypto-hmac.patch b/SOURCES/git-2.27.0-core-crypto-hmac.patch similarity index 81% rename from SOURCES/git-2.26.2-core-crypto-hmac.patch rename to SOURCES/git-2.27.0-core-crypto-hmac.patch index bcc36e4..c99ced2 100644 --- a/SOURCES/git-2.26.2-core-crypto-hmac.patch +++ b/SOURCES/git-2.27.0-core-crypto-hmac.patch @@ -1,21 +1,21 @@ diff -ur a/builtin/receive-pack.c b/builtin/receive-pack.c ---- a/builtin/receive-pack.c 2020-04-20 17:52:30.000000000 +0200 -+++ b/builtin/receive-pack.c 2020-05-26 16:03:25.809849961 +0200 -@@ -28,6 +28,8 @@ - #include "protocol.h" +--- a/builtin/receive-pack.c 2020-06-01 17:49:27.000000000 +0200 ++++ b/builtin/receive-pack.c 2020-06-15 15:28:48.149268576 +0200 +@@ -29,6 +29,8 @@ #include "commit-reach.h" #include "worktree.h" + #include "shallow.h" +#include +#include static const char * const receive_pack_usage[] = { N_("git receive-pack "), -@@ -418,43 +420,11 @@ +@@ -419,43 +421,11 @@ return 0; } --static void hmac(unsigned char *out, -+static inline void hmac(unsigned char *out, +-static void hmac_hash(unsigned char *out, ++static inline void hmac_hash(unsigned char *out, const char *key_in, size_t key_len, const char *text, size_t text_len) { @@ -57,9 +57,9 @@ diff -ur a/builtin/receive-pack.c b/builtin/receive-pack.c static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp) diff -ur a/Makefile b/Makefile ---- a/Makefile 2020-04-20 17:52:30.000000000 +0200 -+++ b/Makefile 2020-05-26 16:04:48.672551647 +0200 -@@ -1832,6 +1832,8 @@ +--- a/Makefile 2020-06-01 17:49:27.000000000 +0200 ++++ b/Makefile 2020-06-15 15:00:45.212758547 +0200 +@@ -1830,6 +1830,8 @@ BASIC_CFLAGS += -DHAVE_GETDELIM endif diff --git a/SOURCES/git-2.27.0.tar.sign b/SOURCES/git-2.27.0.tar.sign new file mode 100644 index 0000000..760ea5d Binary files /dev/null and b/SOURCES/git-2.27.0.tar.sign differ diff --git a/SPECS/git.spec b/SPECS/git.spec index 6dd90cc..1526603 100644 --- a/SPECS/git.spec +++ b/SPECS/git.spec @@ -89,7 +89,7 @@ #global rcrev .rc0 Name: git -Version: 2.26.2 +Version: 2.27.0 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -121,16 +121,9 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch - -# Fix issue with fast-forward rebases when rebase.abbreviateCommands is set -# https://lore.kernel.org/git/9b4bc756764d87c9f34c11e6ec2fc6482f531805.camel@gmail.com/ -# https://github.com/git/git/commit/68e7090f31 -Patch1: 0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch -# https://github.com/git/git/commit/de9f1d3ef4 -Patch2: 0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch -Patch3: 0001-Switch-git-instaweb-default-to-apache-2.26.2.patch +Patch1: 0001-Switch-git-instaweb-default-to-apache-2.26.2.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1619113 -Patch4: git-2.26.2-core-crypto-hmac.patch +Patch2: git-2.27.0-core-crypto-hmac.patch %if %{with docs} # pod2man is needed to build Git.3pm @@ -1068,6 +1061,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jun 11 2020 Ondrej Pohorelsky - 2.27.0-1 +- Update to release 2.27.0 +- Resolves: rhbz#1825114 + * Tue May 26 2020 Ondrej Pohorelsky - 2.26.2-1 - Update to release 2.26.2 - Resolves: rhbz#1825114