diff options
| -rw-r--r-- | pkg/git/.gitignore | 2 | ||||
| -rw-r--r-- | pkg/git/config.h | 2 | ||||
| -rw-r--r-- | pkg/git/man.txt | 2 | ||||
| -rw-r--r-- | pkg/git/patch/0001-revision-use-repository-from-rev_info-when-parsing-c.patch | 32 | ||||
| -rw-r--r-- | pkg/git/sha256 | 2 | ||||
| m--------- | pkg/git/src | 0 | ||||
| -rw-r--r-- | pkg/git/url | 2 | ||||
| -rw-r--r-- | pkg/git/ver | 2 |
8 files changed, 23 insertions, 21 deletions
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore index d9c0e179..e47287bd 100644 --- a/pkg/git/.gitignore +++ b/pkg/git/.gitignore @@ -1,3 +1,3 @@ -/git-manpages-2.27.0.tar.gz +/git-manpages-2.28.0.tar.gz /man /man.ninja diff --git a/pkg/git/config.h b/pkg/git/config.h index d0c8f7b5..aa51699c 100644 --- a/pkg/git/config.h +++ b/pkg/git/config.h @@ -11,7 +11,7 @@ #define GIT_LOCALE_PATH "/share/locale" #define GIT_MAN_PATH "share/man" #define GIT_USER_AGENT "git/" GIT_VERSION -#define GIT_VERSION "2.27.0" +#define GIT_VERSION "2.28.0" #define HAVE_ALLOCA_H #define HAVE_PATHS_H #define HAVE_DEV_TTY diff --git a/pkg/git/man.txt b/pkg/git/man.txt index 7a55c0a5..bb94d330 100644 --- a/pkg/git/man.txt +++ b/pkg/git/man.txt @@ -8,6 +8,7 @@ man1/git-archive.1 man1/git-bisect.1 man1/git-blame.1 man1/git-branch.1 +man1/git-bugreport.1 man1/git-bundle.1 man1/git-cat-file.1 man1/git-check-attr.1 @@ -166,6 +167,7 @@ man7/gitcredentials.7 man7/gitcvs-migration.7 man7/gitdiffcore.7 man7/giteveryday.7 +man7/gitfaq.7 man7/gitglossary.7 man7/gitnamespaces.7 man7/gitremote-helpers.7 diff --git a/pkg/git/patch/0001-revision-use-repository-from-rev_info-when-parsing-c.patch b/pkg/git/patch/0001-revision-use-repository-from-rev_info-when-parsing-c.patch index c27f15a0..0b7b448f 100644 --- a/pkg/git/patch/0001-revision-use-repository-from-rev_info-when-parsing-c.patch +++ b/pkg/git/patch/0001-revision-use-repository-from-rev_info-when-parsing-c.patch @@ -1,4 +1,4 @@ -From 5436472ffdcd5d33b6756a295a10add09db83dd6 Mon Sep 17 00:00:00 2001 +From 212f02aeb196de20d91519e31af40b4170124143 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sun, 21 Jun 2020 14:29:38 -0700 Subject: [PATCH] revision: use repository from rev_info when parsing commits @@ -13,10 +13,10 @@ Signed-off-by: Michael Forney <mforney@mforney.org> 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/commit.h b/commit.h -index 1b2dea5d85..a2e8ca99a2 100644 +index e901538909..a740e0461c 100644 --- a/commit.h +++ b/commit.h -@@ -97,7 +97,6 @@ static inline int parse_commit_no_graph(struct commit *commit) +@@ -95,7 +95,6 @@ static inline int parse_commit_no_graph(struct commit *commit) #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS #define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use) @@ -25,10 +25,10 @@ index 1b2dea5d85..a2e8ca99a2 100644 #endif diff --git a/revision.c b/revision.c -index 60cca8c0b9..3ac0a50ed3 100644 +index 6aa7f4f567..74f66f79a0 100644 --- a/revision.c +++ b/revision.c -@@ -437,7 +437,7 @@ static struct commit *handle_commit(struct rev_info *revs, +@@ -439,7 +439,7 @@ static struct commit *handle_commit(struct rev_info *revs, if (object->type == OBJ_COMMIT) { struct commit *commit = (struct commit *)object; @@ -37,7 +37,7 @@ index 60cca8c0b9..3ac0a50ed3 100644 die("unable to parse commit %s", name); if (flags & UNINTERESTING) { mark_parents_uninteresting(commit); -@@ -987,7 +987,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) +@@ -992,7 +992,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) ts->treesame[0] = 1; } } @@ -46,7 +46,7 @@ index 60cca8c0b9..3ac0a50ed3 100644 die("cannot simplify commit %s (because of %s)", oid_to_hex(&commit->object.oid), oid_to_hex(&p->object.oid)); -@@ -1032,7 +1032,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) +@@ -1037,7 +1037,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) * IOW, we pretend this parent is a * "root" commit. */ @@ -55,7 +55,7 @@ index 60cca8c0b9..3ac0a50ed3 100644 die("cannot simplify commit %s (invalid %s)", oid_to_hex(&commit->object.oid), oid_to_hex(&p->object.oid)); -@@ -1100,7 +1100,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit, +@@ -1105,7 +1105,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit, parent = parent->next; if (p) p->object.flags |= UNINTERESTING; @@ -64,7 +64,7 @@ index 60cca8c0b9..3ac0a50ed3 100644 continue; if (p->parents) mark_parents_uninteresting(p); -@@ -1131,7 +1131,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit, +@@ -1136,7 +1136,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit, struct commit *p = parent->item; int gently = revs->ignore_missing_links || revs->exclude_promisor_objects; @@ -73,7 +73,7 @@ index 60cca8c0b9..3ac0a50ed3 100644 if (revs->exclude_promisor_objects && is_promisor_object(&p->object.oid)) { if (revs->first_parent_only) -@@ -3289,7 +3289,7 @@ static void explore_walk_step(struct rev_info *revs) +@@ -3296,7 +3296,7 @@ static void explore_walk_step(struct rev_info *revs) if (!c) return; @@ -82,7 +82,7 @@ index 60cca8c0b9..3ac0a50ed3 100644 return; if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE) -@@ -3327,7 +3327,7 @@ static void indegree_walk_step(struct rev_info *revs) +@@ -3334,7 +3334,7 @@ static void indegree_walk_step(struct rev_info *revs) if (!c) return; @@ -90,17 +90,17 @@ index 60cca8c0b9..3ac0a50ed3 100644 + if (repo_parse_commit_gently(revs->repo, c, 1) < 0) return; - explore_to_depth(revs, c->generation); -@@ -3408,7 +3408,7 @@ static void init_topo_walk(struct rev_info *revs) - for (list = revs->commits; list; list = list->next) { + explore_to_depth(revs, commit_graph_generation(c)); +@@ -3416,7 +3416,7 @@ static void init_topo_walk(struct rev_info *revs) struct commit *c = list->item; + uint32_t generation; - if (parse_commit_gently(c, 1)) + if (repo_parse_commit_gently(revs->repo, c, 1)) continue; test_flag_and_insert(&info->explore_queue, c, TOPO_WALK_EXPLORED); -@@ -3470,7 +3470,7 @@ static void expand_topo_walk(struct rev_info *revs, struct commit *commit) +@@ -3480,7 +3480,7 @@ static void expand_topo_walk(struct rev_info *revs, struct commit *commit) if (parent->object.flags & UNINTERESTING) continue; @@ -108,7 +108,7 @@ index 60cca8c0b9..3ac0a50ed3 100644 + if (repo_parse_commit_gently(revs->repo, parent, 1) < 0) continue; - if (parent->generation < info->min_generation) { + generation = commit_graph_generation(parent); -- 2.27.0 diff --git a/pkg/git/sha256 b/pkg/git/sha256 index f7f869b1..af48c124 100644 --- a/pkg/git/sha256 +++ b/pkg/git/sha256 @@ -1 +1 @@ -414e4b17133e54d846f6bfa2479f9757c50e16c013eb76167a492ae5409b8947 git-manpages-2.27.0.tar.gz +3cfca28a88d5b8112ea42322b797a500a14d0acddea391aed0462aff1ab11bf7 git-manpages-2.28.0.tar.gz diff --git a/pkg/git/src b/pkg/git/src -Subproject b3d7a52fac39193503a0b6728771d1bf6a16146 +Subproject 47ae905ffb98cc4d4fd90083da6bc8dab55d9ec diff --git a/pkg/git/url b/pkg/git/url index 4f16036f..f9fae650 100644 --- a/pkg/git/url +++ b/pkg/git/url @@ -1 +1 @@ -url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.27.0.tar.gz" +url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.28.0.tar.gz" diff --git a/pkg/git/ver b/pkg/git/ver index 60c7538a..661f485f 100644 --- a/pkg/git/ver +++ b/pkg/git/ver @@ -1 +1 @@ -2.27.0 r2 +2.28.0 r0 |
