diff --git a/0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch b/0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch deleted file mode 100644 index f2136f6..0000000 --- a/0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch +++ /dev/null @@ -1,128 +0,0 @@ -From a937b37e766479c8e780b17cce9c4b252fd97e40 Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Fri, 13 Oct 2017 11:27:45 -0400 -Subject: [PATCH] revision: quit pruning diff more quickly when possible - -When the revision traversal machinery is given a pathspec, -we must compute the parent-diff for each commit to determine -which ones are TREESAME. We set the QUICK diff flag to avoid -looking at more entries than we need; we really just care -whether there are any changes at all. - -But there is one case where we want to know a bit more: if ---remove-empty is set, we care about finding cases where the -change consists only of added entries (in which case we may -prune the parent in try_to_simplify_commit()). To cover that -case, our file_add_remove() callback does not quit the diff -upon seeing an added entry; it keeps looking for other types -of entries. - -But this means when --remove-empty is not set (and it is not -by default), we compute more of the diff than is necessary. -You can see this in a pathological case where a commit adds -a very large number of entries, and we limit based on a -broad pathspec. E.g.: - - perl -e ' - chomp(my $blob = `git hash-object -w --stdin remove_empty_trees. This callback parameter could be -passed to the "add_remove" and "change" callbacks, but -there's not much point. They already receive the -diff_options struct, and doing it this way avoids having to -update the function signature of the other callbacks -(arguably the format_callback and output_prefix functions -could benefit from the same simplification). - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano ---- - diff.h | 1 + - revision.c | 16 +++++++++++++--- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/diff.h b/diff.h -index e9ccb38c26..fe5c287a70 100644 ---- a/diff.h -+++ b/diff.h -@@ -180,6 +180,7 @@ struct diff_options { - pathchange_fn_t pathchange; - change_fn_t change; - add_remove_fn_t add_remove; -+ void *change_fn_data; - diff_format_fn_t format_callback; - void *format_callback_data; - diff_prefix_fn_t output_prefix; -diff --git a/revision.c b/revision.c -index 771d079f6e..7c23ab7afe 100644 ---- a/revision.c -+++ b/revision.c -@@ -394,8 +394,16 @@ static struct commit *one_relevant_parent(const struct rev_info *revs, - * if the whole diff is removal of old data, and otherwise - * REV_TREE_DIFFERENT (of course if the trees are the same we - * want REV_TREE_SAME). -- * That means that once we get to REV_TREE_DIFFERENT, we do not -- * have to look any further. -+ * -+ * The only time we care about the distinction is when -+ * remove_empty_trees is in effect, in which case we care only about -+ * whether the whole change is REV_TREE_NEW, or if there's another type -+ * of change. Which means we can stop the diff early in either of these -+ * cases: -+ * -+ * 1. We're not using remove_empty_trees at all. -+ * -+ * 2. We saw anything except REV_TREE_NEW. - */ - static int tree_difference = REV_TREE_SAME; - -@@ -406,9 +414,10 @@ static void file_add_remove(struct diff_options *options, - const char *fullpath, unsigned dirty_submodule) - { - int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD; -+ struct rev_info *revs = options->change_fn_data; - - tree_difference |= diff; -- if (tree_difference == REV_TREE_DIFFERENT) -+ if (!revs->remove_empty_trees || tree_difference != REV_TREE_NEW) - DIFF_OPT_SET(options, HAS_CHANGES); - } - -@@ -1346,6 +1355,7 @@ void init_revisions(struct rev_info *revs, const char *prefix) - DIFF_OPT_SET(&revs->pruning, QUICK); - revs->pruning.add_remove = file_add_remove; - revs->pruning.change = file_change; -+ revs->pruning.change_fn_data = revs; - revs->sort_order = REV_SORT_IN_GRAPH_ORDER; - revs->dense = 1; - revs->prefix = prefix; --- -2.15.0 - diff --git a/git.spec b/git.spec index 95cc481..292984e 100644 --- a/git.spec +++ b/git.spec @@ -47,8 +47,8 @@ #global rcrev .rc0 Name: git -Version: 2.15.1 -Release: 3%{?rcrev}%{?dist} +Version: 2.16.0 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -83,10 +83,6 @@ Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://bugzilla.redhat.com/1510455 (CVE-2017-15298) -# https://github.com/git/git/commit/a937b37e76 -Patch2: 0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %{with docs} @@ -643,6 +639,7 @@ rm -rf %{buildroot} %endif %{_datadir}/git-core/contrib/hooks/update-paranoid %{_datadir}/git-core/contrib/hooks/setgitperms.perl +%{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample %{_datadir}/git-core/templates/hooks/pre-rebase.sample %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample @@ -655,6 +652,7 @@ rm -rf %{buildroot} # exclude is best way here because of troubles with symlinks inside git-core/ %exclude %{_datadir}/git-core/contrib/hooks/update-paranoid %exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl +%exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample %exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample %exclude %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample %{bashcomproot} @@ -769,6 +767,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jan 18 2018 Todd Zullinger - 2.16.0-1 +- Update to 2.16.0 + * Fri Jan 12 2018 Todd Zullinger - Add %%{emacs_filesystem} to simplify emacs support - Use .in template for git@.service to ensure paths are substituted diff --git a/sources b/sources index 13092a2..1555ad6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.15.1.tar.xz) = dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b -SHA512 (git-2.15.1.tar.sign) = a65038b036cd7a8ecedb83cc46f9c380726481d1ac2f6e0cc932f6f8a8c6c3872782387f882a22be8895abd8709470305a6fb7f228d55ea78632f840ae7045c6 +SHA512 (git-2.16.0.tar.xz) = 11f8f3b5e015cbf7aa768ae66c8a4a81417d78736c10e6e24a2b83b7c3ade3afaa6934ca156c5bb9c3da80cf445549601d494bab86611d7eec7865dbfdcbd812 +SHA512 (git-2.16.0.tar.sign) = af4522517146026f20323e4c551badbd77f50a48aecaa5614048c5fc7176838fee203897c885e8703731e90b80f1b126e20b829034a7f5c1ce54405742d7b252