From 2ffb8bfc373bca335f99debebeafe8cf48381063 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sat, 25 Feb 2017 10:11:37 -0800 Subject: git: Update to 2.12.0 --- pkg/git/.gitignore | 2 +- pkg/git/commands.txt | 1 - pkg/git/config.h | 2 +- pkg/git/gen.rc | 2 ++ pkg/git/man.txt | 3 +-- ...op-dashes-from-builtin-invocations-in-scripts.patch | 18 +++++++++--------- pkg/git/rev | 2 +- pkg/git/sha256 | 2 +- pkg/git/src | 2 +- pkg/git/url | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) (limited to 'pkg/git') diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore index 62dc72ec..c7a2facd 100644 --- a/pkg/git/.gitignore +++ b/pkg/git/.gitignore @@ -1,3 +1,3 @@ -/git-manpages-2.11.1.tar.xz +/git-manpages-2.12.0.tar.xz /man /man.ninja diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt index 006e66c1..7371b518 100644 --- a/pkg/git/commands.txt +++ b/pkg/git/commands.txt @@ -100,7 +100,6 @@ git-read-tree.txt git-rebase.txt git-receive-pack.txt git-reflog.txt -git-relink.txt git-remote-ext.txt git-remote-fd.txt git-remote-testgit.txt diff --git a/pkg/git/config.h b/pkg/git/config.h index e9038250..d328ba1f 100644 --- a/pkg/git/config.h +++ b/pkg/git/config.h @@ -7,7 +7,7 @@ #define GIT_LOCALE_PATH "/share/locale" #define GIT_MAN_PATH "share/man" #define GIT_USER_AGENT "git/" GIT_VERSION -#define GIT_VERSION "2.11.1" +#define GIT_VERSION "2.12.0" #define NO_SYS_POLL_H #define PAGER_ENV "LESS=FRX LV=-c" #define SHA1_HEADER diff --git a/pkg/git/gen.rc b/pkg/git/gen.rc index 210389d9..c0331d3d 100644 --- a/pkg/git/gen.rc +++ b/pkg/git/gen.rc @@ -42,6 +42,7 @@ lib libgit.a -d '$dir'/deps\ compat/obstack.c\ compat/regex/regex.c.o\ compat/terminal.c\ + compat/qsort_s.c\ config.c\ connect.c\ connected.c\ @@ -229,6 +230,7 @@ exe git -d '$dir'/deps git.c common-main.c.o builtin/^(\ diff-index.c\ diff-tree.c\ diff.c\ + difftool.c\ fast-export.c\ fetch-pack.c\ fetch.c\ diff --git a/pkg/git/man.txt b/pkg/git/man.txt index cc259a10..f2998673 100644 --- a/pkg/git/man.txt +++ b/pkg/git/man.txt @@ -1,4 +1,4 @@ -# 2, Date: Sat, 3 Dec 2016 00:41:41 -0800 Subject: [PATCH] Drop dashes from builtin invocations in scripts @@ -12,7 +12,7 @@ Subject: [PATCH] Drop dashes from builtin invocations in scripts 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh -index bcf0d92..6c390d6 100755 +index bcf0d92ec..6c390d6c2 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -100,7 +100,7 @@ do @@ -25,7 +25,7 @@ index bcf0d92..6c390d6 100755 next=$(git write-tree 2>/dev/null) fi diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh -index 424b034..9879c59 100755 +index 424b034e3..9879c5939 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -115,16 +115,16 @@ case "${1:-.}${2:-.}${3:-.}" in @@ -50,7 +50,7 @@ index 424b034..9879c59 100755 esac diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh -index c9da747..343fe7b 100755 +index c9da747fc..343fe7bcc 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -45,7 +45,7 @@ then @@ -63,7 +63,7 @@ index c9da747..343fe7b 100755 exit 0 else diff --git a/git-parse-remote.sh b/git-parse-remote.sh -index d3c3998..dcfa271 100644 +index d3c39980f..dcfa27177 100644 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -2,7 +2,7 @@ @@ -76,10 +76,10 @@ index d3c3998..dcfa271 100644 GIT_DIR=$(git rev-parse -q --git-dir) || :; diff --git a/git-submodule.sh b/git-submodule.sh -index a024a13..4aac71f 100755 +index 136e26a2c..abcb03a0c 100755 --- a/git-submodule.sh +++ b/git-submodule.sh -@@ -843,7 +843,7 @@ cmd_summary() { +@@ -849,7 +849,7 @@ cmd_summary() { test $status != A && test $ignore_config = all && continue fi # Also show added or modified modules which are checked out @@ -88,7 +88,7 @@ index a024a13..4aac71f 100755 printf '%s\n' "$sm_path" done ) -@@ -877,11 +877,11 @@ cmd_summary() { +@@ -883,11 +883,11 @@ cmd_summary() { missing_dst= test $mod_src = 160000 && @@ -103,5 +103,5 @@ index a024a13..4aac71f 100755 display_name=$(git submodule--helper relative-path "$name" "$wt_prefix") -- -2.10.2 +2.11.1 diff --git a/pkg/git/rev b/pkg/git/rev index f599e28b..b4de3947 100644 --- a/pkg/git/rev +++ b/pkg/git/rev @@ -1 +1 @@ -10 +11 diff --git a/pkg/git/sha256 b/pkg/git/sha256 index 5be05020..d58de96d 100644 --- a/pkg/git/sha256 +++ b/pkg/git/sha256 @@ -1 +1 @@ -69486ed339ee0591001ae83d43c888aa26351b9680b6ceb59e06b593051bca31 git-manpages-2.11.1.tar.xz +8b8356f8d50eff6499c5d05e87c106a7b1b48bd16de1742fa022631909804773 git-manpages-2.12.0.tar.xz diff --git a/pkg/git/src b/pkg/git/src index 3b9e3c2c..e7e07d5a 160000 --- a/pkg/git/src +++ b/pkg/git/src @@ -1 +1 @@ -Subproject commit 3b9e3c2cede15057af3ff8076c45ad5f33829436 +Subproject commit e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7 diff --git a/pkg/git/url b/pkg/git/url index 6235ecd1..a78aee34 100644 --- a/pkg/git/url +++ b/pkg/git/url @@ -1 +1 @@ -url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.11.1.tar.xz" +url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.12.0.tar.xz" -- cgit v1.2.3