git: Update to 2.22.1

1 files changed, 15 insertions, 15 deletions

diff --git a/pkg/git/patch/0001-Avoid-casts-of-string-literal-to-integer-in-initiali.patch b/pkg/git/patch/0001-Avoid-casts-of-string-literal-to-integer-in-initiali.patch
index 144932ff..6266d83b 100644
--- a/pkg/git/patch/0001-Avoid-casts-of-string-literal-to-integer-in-initiali.patch
+++ b/pkg/git/patch/0001-Avoid-casts-of-string-literal-to-integer-in-initiali.patch
@@ -1,4 +1,4 @@
-From 25f4b5afa6e1158adff616659b5d654a253885d2 Mon Sep 17 00:00:00 2001
+From 678faaeb303d77cf267819834617bd2c4bffcac4 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 21 Jun 2019 00:07:49 -0700
 Subject: [PATCH] Avoid casts of string literal to integer in initializers
@@ -31,10 +31,10 @@ Subject: [PATCH] Avoid casts of string literal to integer in initializers
  24 files changed, 85 insertions(+), 82 deletions(-)
 
 diff --git a/builtin/am.c b/builtin/am.c
-index 912d9821b1..07a31fa124 100644
+index 252e37ddf0..27f524e5dd 100644
 --- a/builtin/am.c
 +++ b/builtin/am.c
-@@ -2253,7 +2253,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
+@@ -2251,7 +2251,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
  		OPT_RERERE_AUTOUPDATE(&state.allow_rerere_autoupdate),
  		{ OPTION_STRING, 'S', "gpg-sign", &state.sign_commit, N_("key-id"),
  		  N_("GPG-sign commits"),
@@ -57,7 +57,7 @@ index 21cde57e71..6947378dcc 100644
  		OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL),
  		OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from <file> instead of calling git-rev-list")),
 diff --git a/builtin/clone.c b/builtin/clone.c
-index 85b0d3155d..1884593ed3 100644
+index 3623f040d4..f2dafea4f6 100644
 --- a/builtin/clone.c
 +++ b/builtin/clone.c
 @@ -77,7 +77,7 @@ static int recurse_submodules_cb(const struct option *opt,
@@ -92,7 +92,7 @@ index b866d83951..13e7647f16 100644
  	};
  
 diff --git a/builtin/commit.c b/builtin/commit.c
-index 1c9e8e2228..121a6cca17 100644
+index 1921401117..f439c8e3c1 100644
 --- a/builtin/commit.c
 +++ b/builtin/commit.c
 @@ -1334,14 +1334,14 @@ int cmd_status(int argc, const char **argv, const char *prefix)
@@ -192,7 +192,7 @@ index a4615587fd..507d1841ab 100644
  			N_("use <text> as start of message")),
  		OPT_FILENAME('F', "file", &inpath, N_("file to read from")),
 diff --git a/builtin/gc.c b/builtin/gc.c
-index 8943bcc300..e823b6cfb3 100644
+index be8e0bfcbe..2542795966 100644
 --- a/builtin/gc.c
 +++ b/builtin/gc.c
 @@ -538,7 +538,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
@@ -227,7 +227,7 @@ index 580fd38f41..7653f461b6 100644
  			   N_("allow calling of grep(1) (ignored by this build)"),
  			   PARSE_OPT_NOCOMPLETE),
 diff --git a/builtin/init-db.c b/builtin/init-db.c
-index 6ca002893f..4137ff74f1 100644
+index 944ec77fe1..8241581ef9 100644
 --- a/builtin/init-db.c
 +++ b/builtin/init-db.c
 @@ -490,7 +490,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
@@ -240,7 +240,7 @@ index 6ca002893f..4137ff74f1 100644
  		OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"),
  			   N_("separate git dir from working tree")),
 diff --git a/builtin/merge.c b/builtin/merge.c
-index e96f72af80..259d86a2c0 100644
+index 29988e54c5..75e4b0aa0a 100644
 --- a/builtin/merge.c
 +++ b/builtin/merge.c
 @@ -246,7 +246,7 @@ static struct option builtin_merge_options[] = {
@@ -284,7 +284,7 @@ index 05ccf53e00..baca21432e 100644
  		OPT_END(),
  	};
 diff --git a/builtin/rebase.c b/builtin/rebase.c
-index db6ca9bd7d..5de445da04 100644
+index 2748fa6f2e..4792d58539 100644
 --- a/builtin/rebase.c
 +++ b/builtin/rebase.c
 @@ -476,19 +476,19 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
@@ -312,7 +312,7 @@ index db6ca9bd7d..5de445da04 100644
  		OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
  			   N_("rebase strategy")),
  		OPT_STRING(0, "strategy-opts", &opts.strategy_opts, N_("strategy-opts"),
-@@ -1398,7 +1398,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
+@@ -1409,7 +1409,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
  			REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
  		{OPTION_NEGBIT, 'n', "no-stat", &options.flags, NULL,
  			N_("do not show diffstat of what changed upstream"),
@@ -321,7 +321,7 @@ index db6ca9bd7d..5de445da04 100644
  		OPT_BOOL(0, "signoff", &options.signoff,
  			 N_("add a Signed-off-by: line to each commit")),
  		OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &options.git_am_opts,
-@@ -1452,7 +1452,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
+@@ -1463,7 +1463,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
  			    "squash!/fixup! under -i")),
  		{ OPTION_STRING, 'S', "gpg-sign", &gpg_sign, N_("key-id"),
  			N_("GPG-sign commits"),
@@ -330,7 +330,7 @@ index db6ca9bd7d..5de445da04 100644
  		OPT_BOOL(0, "autostash", &options.autostash,
  			 N_("automatically stash/stash pop before and after")),
  		OPT_STRING_LIST('x', "exec", &exec, N_("exec"),
-@@ -1461,10 +1461,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
+@@ -1472,10 +1472,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
  		OPT_BOOL(0, "allow-empty-message",
  			 &options.allow_empty_message,
  			 N_("allow rebasing commits with empty messages")),
@@ -392,7 +392,7 @@ index ef37dccf86..991da75157 100644
  		OPT_STRING(  0 , "format", &format.format, N_("format"),
  			   N_("format to use for the output")),
 diff --git a/builtin/update-index.c b/builtin/update-index.c
-index 27db0928bf..11af1887ee 100644
+index 3f8cc6ccb4..8b123cd370 100644
 --- a/builtin/update-index.c
 +++ b/builtin/update-index.c
 @@ -995,7 +995,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
@@ -476,10 +476,10 @@ index 3d46d22ee5..635f4e7219 100644
  	};
  
 diff --git a/diff.c b/diff.c
-index a654d46f6a..7ef104dd69 100644
+index 1ccd96bbfd..b0f62774fb 100644
 --- a/diff.c
 +++ b/diff.c
-@@ -5515,7 +5515,7 @@ static void prep_parse_options(struct diff_options *options)
+@@ -5517,7 +5517,7 @@ static void prep_parse_options(struct diff_options *options)
  			       PARSE_OPT_NONEG, diff_opt_diff_filter),
  		{ OPTION_CALLBACK, 0, "output", options, N_("<file>"),
  		  N_("Output to a specific file"),