Update 2 packages

mingw-w64-x86_64-git (2.34.1.1.2ca94ab318-1 -> 2.35.0.rc0.windows.1-1) mingw-w64-x86_64-git-doc-html (2.34.1.1.2ca94ab318-1 -> 2.35.0.rc0.windows.1-1) Signed-off-by: Git for Windows Build Agent <ci@git-for-windows.build>
awol96 · Jan 12, 2022 · 4e3578c · 4e3578c
1 parent 9ea43cb
commit 4e3578c
Show file tree

Hide file tree

Showing 533 changed files with 2,105 additions and 1,208 deletions.
diff --git a/cmd/git-gui.exe b/cmd/git-gui.exe
diff --git a/cmd/git.exe b/cmd/git.exe
diff --git a/cmd/gitk.exe b/cmd/gitk.exe
diff --git a/git-bash.exe b/git-bash.exe
diff --git a/git-cmd.exe b/git-cmd.exe
diff --git a/mingw64/bin/git-cvsserver b/mingw64/bin/git-cvsserver
@@ -69,7 +69,7 @@ use File::Path qw/rmtree/;
 use File::Basename;
 use Getopt::Long qw(:config require_order no_ignore_case);
 
-my $VERSION = '2.34.1.windows.1';
+my $VERSION = '2.35.0.rc0.windows.1';
 
 my $log = GITCVS::log->new();
 my $cfg;
@@ -3650,6 +3650,22 @@ package GITCVS::updater;
 use strict;
 use warnings;
 use DBI;
+our $_use_fsync;
+
+# n.b. consider using Git.pm
+sub use_fsync {
+    if (!defined($_use_fsync)) {
+        my $x = $ENV{GIT_TEST_FSYNC};
+        if (defined $x) {
+            local $ENV{GIT_CONFIG};
+            delete $ENV{GIT_CONFIG};
+            my $v = ::safe_pipe_capture('git', '-c', "test.fsync=$x",
+                                        qw(config --type=bool test.fsync));
+            $_use_fsync = defined($v) ? ($v eq "true\n") : 1;
+        }
+    }
+    $_use_fsync;
+}
 
 =head1 METHODS
 
@@ -3719,6 +3735,9 @@ sub new
                                 $self->{dbuser},
                                 $self->{dbpass});
     die "Error connecting to database\n" unless defined $self->{dbh};
+    if ($self->{dbdriver} eq 'SQLite' && !use_fsync()) {
+        $self->{dbh}->do('PRAGMA synchronous = OFF');
+    }
 
     $self->{tables} = {};
     foreach my $table ( keys %{$self->{dbh}->table_info(undef,undef,undef,'TABLE')->fetchall_hashref('TABLE_NAME')} )

diff --git a/mingw64/bin/git-receive-pack.exe b/mingw64/bin/git-receive-pack.exe
diff --git a/mingw64/bin/git-shell.exe b/mingw64/bin/git-shell.exe
diff --git a/mingw64/bin/git-upload-archive.exe b/mingw64/bin/git-upload-archive.exe
diff --git a/mingw64/bin/git-upload-pack.exe b/mingw64/bin/git-upload-pack.exe
diff --git a/mingw64/bin/git.exe b/mingw64/bin/git.exe
diff --git a/mingw64/libexec/git-core/git-add--interactive b/mingw64/libexec/git-core/git-add--interactive
@@ -1236,15 +1236,17 @@ sub prompt_single_character {
 		ReadMode 'cbreak';
 		my $key = ReadKey 0;
 		ReadMode 'restore';
-		if ($use_termcap and $key eq "\e") {
-			while (!defined $term_escapes{$key}) {
-				my $next = ReadKey 0.5;
-				last if (!defined $next);
-				$key .= $next;
+		if (defined $key) {
+			if ($use_termcap and $key eq "\e") {
+				while (!defined $term_escapes{$key}) {
+					my $next = ReadKey 0.5;
+					last if (!defined $next);
+					$key .= $next;
+				}
+				$key =~ s/\e/^[/;
 			}
-			$key =~ s/\e/^[/;
+			print "$key";
 		}
-		print "$key" if defined $key;
 		print "\n";
 		return $key;
 	} else {

diff --git a/mingw64/libexec/git-core/git-add.exe b/mingw64/libexec/git-core/git-add.exe
diff --git a/mingw64/libexec/git-core/git-am.exe b/mingw64/libexec/git-core/git-am.exe
diff --git a/mingw64/libexec/git-core/git-annotate.exe b/mingw64/libexec/git-core/git-annotate.exe
diff --git a/mingw64/libexec/git-core/git-apply.exe b/mingw64/libexec/git-core/git-apply.exe
diff --git a/mingw64/libexec/git-core/git-archive.exe b/mingw64/libexec/git-core/git-archive.exe
diff --git a/mingw64/libexec/git-core/git-bisect--helper.exe b/mingw64/libexec/git-core/git-bisect--helper.exe
diff --git a/mingw64/libexec/git-core/git-blame.exe b/mingw64/libexec/git-core/git-blame.exe
diff --git a/mingw64/libexec/git-core/git-branch.exe b/mingw64/libexec/git-core/git-branch.exe
diff --git a/mingw64/libexec/git-core/git-bugreport.exe b/mingw64/libexec/git-core/git-bugreport.exe
diff --git a/mingw64/libexec/git-core/git-bundle.exe b/mingw64/libexec/git-core/git-bundle.exe
diff --git a/mingw64/libexec/git-core/git-cat-file.exe b/mingw64/libexec/git-core/git-cat-file.exe
diff --git a/mingw64/libexec/git-core/git-check-attr.exe b/mingw64/libexec/git-core/git-check-attr.exe
diff --git a/mingw64/libexec/git-core/git-check-ignore.exe b/mingw64/libexec/git-core/git-check-ignore.exe
diff --git a/mingw64/libexec/git-core/git-check-mailmap.exe b/mingw64/libexec/git-core/git-check-mailmap.exe
diff --git a/mingw64/libexec/git-core/git-check-ref-format.exe b/mingw64/libexec/git-core/git-check-ref-format.exe
diff --git a/mingw64/libexec/git-core/git-checkout--worker.exe b/mingw64/libexec/git-core/git-checkout--worker.exe
diff --git a/mingw64/libexec/git-core/git-checkout-index.exe b/mingw64/libexec/git-core/git-checkout-index.exe
diff --git a/mingw64/libexec/git-core/git-checkout.exe b/mingw64/libexec/git-core/git-checkout.exe
diff --git a/mingw64/libexec/git-core/git-cherry-pick.exe b/mingw64/libexec/git-core/git-cherry-pick.exe
diff --git a/mingw64/libexec/git-core/git-cherry.exe b/mingw64/libexec/git-core/git-cherry.exe
diff --git a/mingw64/libexec/git-core/git-clean.exe b/mingw64/libexec/git-core/git-clean.exe
diff --git a/mingw64/libexec/git-core/git-clone.exe b/mingw64/libexec/git-core/git-clone.exe
diff --git a/mingw64/libexec/git-core/git-column.exe b/mingw64/libexec/git-core/git-column.exe
diff --git a/mingw64/libexec/git-core/git-commit-graph.exe b/mingw64/libexec/git-core/git-commit-graph.exe
diff --git a/mingw64/libexec/git-core/git-commit-tree.exe b/mingw64/libexec/git-core/git-commit-tree.exe
diff --git a/mingw64/libexec/git-core/git-commit.exe b/mingw64/libexec/git-core/git-commit.exe
diff --git a/mingw64/libexec/git-core/git-config.exe b/mingw64/libexec/git-core/git-config.exe
diff --git a/mingw64/libexec/git-core/git-count-objects.exe b/mingw64/libexec/git-core/git-count-objects.exe
diff --git a/mingw64/libexec/git-core/git-credential-cache--daemon.exe b/mingw64/libexec/git-core/git-credential-cache--daemon.exe
diff --git a/mingw64/libexec/git-core/git-credential-cache.exe b/mingw64/libexec/git-core/git-credential-cache.exe
diff --git a/mingw64/libexec/git-core/git-credential-store.exe b/mingw64/libexec/git-core/git-credential-store.exe
diff --git a/mingw64/libexec/git-core/git-credential-wincred.exe b/mingw64/libexec/git-core/git-credential-wincred.exe
diff --git a/mingw64/libexec/git-core/git-credential.exe b/mingw64/libexec/git-core/git-credential.exe
diff --git a/mingw64/libexec/git-core/git-cvsserver b/mingw64/libexec/git-core/git-cvsserver
@@ -69,7 +69,7 @@ use File::Path qw/rmtree/;
 use File::Basename;
 use Getopt::Long qw(:config require_order no_ignore_case);
 
-my $VERSION = '2.34.1.windows.1';
+my $VERSION = '2.35.0.rc0.windows.1';
 
 my $log = GITCVS::log->new();
 my $cfg;
@@ -3650,6 +3650,22 @@ package GITCVS::updater;
 use strict;
 use warnings;
 use DBI;
+our $_use_fsync;
+
+# n.b. consider using Git.pm
+sub use_fsync {
+    if (!defined($_use_fsync)) {
+        my $x = $ENV{GIT_TEST_FSYNC};
+        if (defined $x) {
+            local $ENV{GIT_CONFIG};
+            delete $ENV{GIT_CONFIG};
+            my $v = ::safe_pipe_capture('git', '-c', "test.fsync=$x",
+                                        qw(config --type=bool test.fsync));
+            $_use_fsync = defined($v) ? ($v eq "true\n") : 1;
+        }
+    }
+    $_use_fsync;
+}
 
 =head1 METHODS
 
@@ -3719,6 +3735,9 @@ sub new
                                 $self->{dbuser},
                                 $self->{dbpass});
     die "Error connecting to database\n" unless defined $self->{dbh};
+    if ($self->{dbdriver} eq 'SQLite' && !use_fsync()) {
+        $self->{dbh}->do('PRAGMA synchronous = OFF');
+    }
 
     $self->{tables} = {};
     foreach my $table ( keys %{$self->{dbh}->table_info(undef,undef,undef,'TABLE')->fetchall_hashref('TABLE_NAME')} )

diff --git a/mingw64/libexec/git-core/git-daemon.exe b/mingw64/libexec/git-core/git-daemon.exe
diff --git a/mingw64/libexec/git-core/git-describe.exe b/mingw64/libexec/git-core/git-describe.exe
diff --git a/mingw64/libexec/git-core/git-diff-files.exe b/mingw64/libexec/git-core/git-diff-files.exe
diff --git a/mingw64/libexec/git-core/git-diff-index.exe b/mingw64/libexec/git-core/git-diff-index.exe
diff --git a/mingw64/libexec/git-core/git-diff-tree.exe b/mingw64/libexec/git-core/git-diff-tree.exe
diff --git a/mingw64/libexec/git-core/git-diff.exe b/mingw64/libexec/git-core/git-diff.exe
diff --git a/mingw64/libexec/git-core/git-difftool.exe b/mingw64/libexec/git-core/git-difftool.exe
diff --git a/mingw64/libexec/git-core/git-env--helper.exe b/mingw64/libexec/git-core/git-env--helper.exe
diff --git a/mingw64/libexec/git-core/git-fast-export.exe b/mingw64/libexec/git-core/git-fast-export.exe
diff --git a/mingw64/libexec/git-core/git-fast-import.exe b/mingw64/libexec/git-core/git-fast-import.exe
diff --git a/mingw64/libexec/git-core/git-fetch-pack.exe b/mingw64/libexec/git-core/git-fetch-pack.exe
diff --git a/mingw64/libexec/git-core/git-fetch.exe b/mingw64/libexec/git-core/git-fetch.exe
diff --git a/mingw64/libexec/git-core/git-filter-branch b/mingw64/libexec/git-core/git-filter-branch
@@ -579,7 +579,7 @@ if [ "$filter_tag_name" ]; then
 				git hash-object -t tag -w --stdin) ||
 				die "Could not create new tag object for $ref"
 			if git cat-file tag "$ref" | \
-			   sane_grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1
+			   grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1
 			then
 				warn "gpg signature stripped from tag object $sha1t"
 			fi

diff --git a/mingw64/libexec/git-core/git-fmt-merge-msg.exe b/mingw64/libexec/git-core/git-fmt-merge-msg.exe
diff --git a/mingw64/libexec/git-core/git-for-each-ref.exe b/mingw64/libexec/git-core/git-for-each-ref.exe
diff --git a/mingw64/libexec/git-core/git-for-each-repo.exe b/mingw64/libexec/git-core/git-for-each-repo.exe
diff --git a/mingw64/libexec/git-core/git-format-patch.exe b/mingw64/libexec/git-core/git-format-patch.exe
diff --git a/mingw64/libexec/git-core/git-fsck-objects.exe b/mingw64/libexec/git-core/git-fsck-objects.exe
diff --git a/mingw64/libexec/git-core/git-fsck.exe b/mingw64/libexec/git-core/git-fsck.exe
diff --git a/mingw64/libexec/git-core/git-fsmonitor--daemon.exe b/mingw64/libexec/git-core/git-fsmonitor--daemon.exe
diff --git a/mingw64/libexec/git-core/git-gc.exe b/mingw64/libexec/git-core/git-gc.exe
diff --git a/mingw64/libexec/git-core/git-get-tar-commit-id.exe b/mingw64/libexec/git-core/git-get-tar-commit-id.exe
diff --git a/mingw64/libexec/git-core/git-grep.exe b/mingw64/libexec/git-core/git-grep.exe
diff --git a/mingw64/libexec/git-core/git-hash-object.exe b/mingw64/libexec/git-core/git-hash-object.exe
diff --git a/mingw64/libexec/git-core/git-help.exe b/mingw64/libexec/git-core/git-help.exe
diff --git a/mingw64/libexec/git-core/git-http-backend.exe b/mingw64/libexec/git-core/git-http-backend.exe
diff --git a/mingw64/libexec/git-core/git-http-fetch.exe b/mingw64/libexec/git-core/git-http-fetch.exe
diff --git a/mingw64/libexec/git-core/git-http-push.exe b/mingw64/libexec/git-core/git-http-push.exe
diff --git a/mingw64/libexec/git-core/git-imap-send.exe b/mingw64/libexec/git-core/git-imap-send.exe
diff --git a/mingw64/libexec/git-core/git-index-pack.exe b/mingw64/libexec/git-core/git-index-pack.exe
diff --git a/mingw64/libexec/git-core/git-init-db.exe b/mingw64/libexec/git-core/git-init-db.exe
diff --git a/mingw64/libexec/git-core/git-init.exe b/mingw64/libexec/git-core/git-init.exe
diff --git a/mingw64/libexec/git-core/git-instaweb b/mingw64/libexec/git-core/git-instaweb
@@ -49,7 +49,7 @@ resolve_full_httpd () {
 	*apache2*|*lighttpd*|*httpd*)
 		# yes, *httpd* covers *lighttpd* above, but it is there for clarity
 		# ensure that the apache2/lighttpd command ends with "-f"
-		if ! echo "$httpd" | sane_grep -- '-f *$' >/dev/null 2>&1
+		if ! echo "$httpd" | grep -- '-f *$' >/dev/null 2>&1
 		then
 			httpd="$httpd -f"
 		fi
@@ -380,10 +380,7 @@ TypesConfig "$fqgitdir/mime.types"
 DirectoryIndex gitweb.cgi
 EOF
 
-	# check to see if Dennis Stosberg's mod_perl compatibility patch
-	# (<20060621130708.Gcbc6e5c@leonov.stosberg.net>) has been applied
-	if test -f "$module_path/mod_perl.so" &&
-	   sane_grep 'MOD_PERL' "$root/gitweb.cgi" >/dev/null
+	if test -f "$module_path/mod_perl.so"
 	then
 		# favor mod_perl if available
 		cat >> "$conf" <<EOF
@@ -402,7 +399,7 @@ EOF
 		# plain-old CGI
 		resolve_full_httpd
 		list_mods=$(echo "$full_httpd" | sed 's/-f$/-l/')
-		$list_mods | sane_grep 'mod_cgi\.c' >/dev/null 2>&1 || \
+		$list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \
 		if test -f "$module_path/mod_cgi.so"
 		then
 			echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf"

diff --git a/mingw64/libexec/git-core/git-interpret-trailers.exe b/mingw64/libexec/git-core/git-interpret-trailers.exe
diff --git a/mingw64/libexec/git-core/git-log.exe b/mingw64/libexec/git-core/git-log.exe
diff --git a/mingw64/libexec/git-core/git-ls-files.exe b/mingw64/libexec/git-core/git-ls-files.exe
diff --git a/mingw64/libexec/git-core/git-ls-remote.exe b/mingw64/libexec/git-core/git-ls-remote.exe
diff --git a/mingw64/libexec/git-core/git-ls-tree.exe b/mingw64/libexec/git-core/git-ls-tree.exe
diff --git a/mingw64/libexec/git-core/git-mailinfo.exe b/mingw64/libexec/git-core/git-mailinfo.exe
diff --git a/mingw64/libexec/git-core/git-mailsplit.exe b/mingw64/libexec/git-core/git-mailsplit.exe
diff --git a/mingw64/libexec/git-core/git-maintenance.exe b/mingw64/libexec/git-core/git-maintenance.exe
diff --git a/mingw64/libexec/git-core/git-merge-base.exe b/mingw64/libexec/git-core/git-merge-base.exe
diff --git a/mingw64/libexec/git-core/git-merge-file.exe b/mingw64/libexec/git-core/git-merge-file.exe
diff --git a/mingw64/libexec/git-core/git-merge-index.exe b/mingw64/libexec/git-core/git-merge-index.exe
diff --git a/mingw64/libexec/git-core/git-merge-ours.exe b/mingw64/libexec/git-core/git-merge-ours.exe
diff --git a/mingw64/libexec/git-core/git-merge-recursive.exe b/mingw64/libexec/git-core/git-merge-recursive.exe
diff --git a/mingw64/libexec/git-core/git-merge-subtree.exe b/mingw64/libexec/git-core/git-merge-subtree.exe
diff --git a/mingw64/libexec/git-core/git-merge-tree.exe b/mingw64/libexec/git-core/git-merge-tree.exe
diff --git a/mingw64/libexec/git-core/git-merge.exe b/mingw64/libexec/git-core/git-merge.exe
diff --git a/mingw64/libexec/git-core/git-mktag.exe b/mingw64/libexec/git-core/git-mktag.exe
diff --git a/mingw64/libexec/git-core/git-mktree.exe b/mingw64/libexec/git-core/git-mktree.exe
diff --git a/mingw64/libexec/git-core/git-multi-pack-index.exe b/mingw64/libexec/git-core/git-multi-pack-index.exe
diff --git a/mingw64/libexec/git-core/git-mv.exe b/mingw64/libexec/git-core/git-mv.exe
diff --git a/mingw64/libexec/git-core/git-name-rev.exe b/mingw64/libexec/git-core/git-name-rev.exe
diff --git a/mingw64/libexec/git-core/git-notes.exe b/mingw64/libexec/git-core/git-notes.exe