Update 20180623-031609

Signed-off-by: Git for Windows Build Agent <[email protected]>

Author: Git for Windows Build Agent

cmd/git-gui.exe

@@ -58,7 +58,6 @@
         )
     )
     @REM See if we have the key
-    @SET "HOME=%USERPROFILE%"
     @"!SSH_ADD!" -l 1>NUL 2>NUL
     @SET result=!ERRORLEVEL!
     @IF NOT !result! == 0 @(

cmd/git.exe

@@ -1,12 +1,14 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" catalog="file:///etc/xml/docbook-xml"/>
-  <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///etc/xml/docbook-xml"/>
-  <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/xml/docbook-xml"/>
-  <delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/xml/docbook-xml"/>
-  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.78.1" rewritePrefix="/usr/share/xml/docbook/xsl-stylesheets-1.78.1"/>
-  <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/1.78.1" rewritePrefix="/usr/share/xml/docbook/xsl-stylesheets-1.78.1"/>
-  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current" rewritePrefix="/usr/share/xml/docbook/xsl-stylesheets-1.78.1"/>
-  <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current" rewritePrefix="/usr/share/xml/docbook/xsl-stylesheets-1.78.1"/>
-</catalog>
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" catalog="file:///etc/xml/docbook-xml"/>
+  <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///etc/xml/docbook-xml"/>
+  <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/xml/docbook-xml"/>
+  <delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/xml/docbook-xml"/>
+  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.78.1" rewritePrefix="/usr/share/xml/docbook/xsl-stylesheets-1.78.1"/>
+  <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/1.78.1" rewritePrefix="/usr/share/xml/docbook/xsl-stylesheets-1.78.1"/>
+  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current" rewritePrefix="C:/git-sdk-64-ci/usr/share/xml/docbook/xsl-stylesheets-1.79.2"/>
+  <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current" rewritePrefix="C:/git-sdk-64-ci/usr/share/xml/docbook/xsl-stylesheets-1.79.2"/>
+  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.79.2" rewritePrefix="C:/git-sdk-64-ci/usr/share/xml/docbook/xsl-stylesheets-1.79.2"/>
+  <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/1.79.2" rewritePrefix="C:/git-sdk-64-ci/usr/share/xml/docbook/xsl-stylesheets-1.79.2"/>
+</catalog>

cmd/gitk.exe

@@ -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.17.1.windows.2';
+my $VERSION = '2.18.0.windows.1';
 
 my $log = GITCVS::log->new();
 my $cfg;

cmd/start-ssh-agent.cmd

@@ -266,8 +266,15 @@ my $status_head = sprintf($status_fmt, __('staged'), __('unstaged'), __('path'))
 	}
 }
 
-sub get_empty_tree {
-	return '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
+{
+	my $empty_tree;
+	sub get_empty_tree {
+		return $empty_tree if defined $empty_tree;
+
+		$empty_tree = run_cmd_pipe(qw(git hash-object -t tree /dev/null));
+		chomp $empty_tree;
+		return $empty_tree;
+	}
 }
 
 sub get_diff_reference {

etc/pacman.d/gnupg/.gpg-v21-migrated

@@ -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.17.1.windows.2';
+my $VERSION = '2.18.0.windows.1';
 
 my $log = GITCVS::log->new();
 my $cfg;

etc/pacman.d/gnupg/S.gpg-agent

@@ -11,6 +11,8 @@
 # The following functions will also be available in the commit filter:
 
 functions=$(cat << \EOF
+EMPTY_TREE=$(git hash-object -t tree /dev/null)
+
 warn () {
 	echo "$*" >&2
 }
@@ -46,7 +48,7 @@ git_commit_non_empty_tree()
 {
 	if test $# = 3 && test "$1" = $(git rev-parse "$3^{tree}"); then
 		map "$3"
-	elif test $# = 1 && test "$1" = 4b825dc642cb6eb9a060e54bf8d69288fbee4904; then
+	elif test $# = 1 && test "$1" = $EMPTY_TREE; then
 		:
 	else
 		git commit-tree "$@"
@@ -251,8 +253,18 @@ done < "$tempdir"/backup-refs
 
 # The refs should be updated if their heads were rewritten
 git rev-parse --no-flags --revs-only --symbolic-full-name \
-	--default HEAD "$@" > "$tempdir"/raw-heads || exit
-sed -e '/^^/d' "$tempdir"/raw-heads >"$tempdir"/heads
+	--default HEAD "$@" > "$tempdir"/raw-refs || exit
+while read ref
+do
+	case "$ref" in ^?*) continue ;; esac
+
+	if git rev-parse --verify "$ref"^0 >/dev/null 2>&1
+	then
+		echo "$ref"
+	else
+		warn "WARNING: not rewriting '$ref' (not a committish)"
+	fi
+done >"$tempdir"/heads <"$tempdir"/raw-refs
 
 test -s "$tempdir"/heads ||
 	die "You must specify a ref to rewrite."
@@ -310,7 +322,7 @@ git rev-list --reverse --topo-order --default HEAD \
 	die "Could not get the commits"
 commits=$(wc -l <../revs | tr -d " ")
 
-test $commits -eq 0 && die "Found nothing to rewrite"
+test $commits -eq 0 && die_with_status 2 "Found nothing to rewrite"
 
 # Rewrite the commits
 report_progress ()

etc/pacman.d/gnupg/S.gpg-agent.browser

@@ -3886,6 +3886,7 @@ bind .   <$M1B-Key-equal> {show_more_context;break}
 bind .   <$M1B-Key-plus> {show_more_context;break}
 bind .   <$M1B-Key-KP_Add> {show_more_context;break}
 bind .   <$M1B-Key-Return> do_commit
+bind .   <$M1B-Key-KP_Enter> do_commit
 foreach i [list $ui_index $ui_workdir] {
 	bind $i <Button-1>       { toggle_or_diff click %W %x %y; break }
 	bind $i <$M1B-Button-1>  { add_one_to_selection %W %x %y; break }

etc/pacman.d/gnupg/S.gpg-agent.extra

@@ -120,7 +120,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 	case "$1" in
 	'')
 		echo "Added $4 in both, but differently."
-		orig=$(git unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
+		orig=$(git unpack-file $(git hash-object /dev/null))
 		;;
 	*)
 		echo "Auto-merging $4"