Update 2 packages

mingw-w64-x86_64-git (2.46.0.1.2e6a859ffc-1 -> 2.46.1.1.6cd9c8395e-1) mingw-w64-x86_64-git-doc-html (2.46.0.1.2e6a859ffc-1 -> 2.46.1.1.6cd9c8395e-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
git-for-windows · Sep 19, 2024 · 7d0069f · 7d0069f
1 parent cff1370
commit 7d0069f
Show file tree

Hide file tree

Showing 324 changed files with 623 additions and 420 deletions.
diff --git a/cmd/git-gui.exe b/cmd/git-gui.exe
diff --git a/cmd/git-receive-pack.exe b/cmd/git-receive-pack.exe
diff --git a/cmd/git-upload-pack.exe b/cmd/git-upload-pack.exe
diff --git a/cmd/git.exe b/cmd/git.exe
diff --git a/cmd/gitk.exe b/cmd/gitk.exe
diff --git a/cmd/scalar.exe b/cmd/scalar.exe
diff --git a/cmd/tig.exe b/cmd/tig.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.46.0.windows.1';
+my $VERSION = '2.46.1.windows.1';
 
 my $log = GITCVS::log->new();
 my $cfg;

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/bin/scalar.exe b/mingw64/bin/scalar.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-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.46.0.windows.1';
+my $VERSION = '2.46.1.windows.1';
 
 my $log = GITCVS::log->new();
 my $cfg;

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-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-remote-ftp.exe b/mingw64/libexec/git-core/git-remote-ftp.exe
diff --git a/mingw64/libexec/git-core/git-remote-ftps.exe b/mingw64/libexec/git-core/git-remote-ftps.exe
diff --git a/mingw64/libexec/git-core/git-remote-http.exe b/mingw64/libexec/git-core/git-remote-http.exe
diff --git a/mingw64/libexec/git-core/git-remote-https.exe b/mingw64/libexec/git-core/git-remote-https.exe
diff --git a/mingw64/libexec/git-core/git-send-email b/mingw64/libexec/git-core/git-send-email
@@ -1505,7 +1505,7 @@ sub gen_header {
 	@recipients = unique_email_list(@recipients,@cc,@initial_bcc);
 	@recipients = (map { extract_valid_address_or_die($_) } @recipients);
 	my $date = format_2822_time($time++);
-	my $gitversion = '2.46.0.windows.1';
+	my $gitversion = '2.46.1.windows.1';
 	if ($gitversion =~ m/..GIT_VERSION../) {
 	    $gitversion = Git::version();
 	}

diff --git a/mingw64/libexec/git-core/git-sh-i18n--envsubst.exe b/mingw64/libexec/git-core/git-sh-i18n--envsubst.exe
diff --git a/mingw64/libexec/git-core/git-shell.exe b/mingw64/libexec/git-core/git-shell.exe
diff --git a/mingw64/libexec/git-core/git-svn b/mingw64/libexec/git-core/git-svn
@@ -52,7 +52,7 @@ use vars qw/	$AUTHOR $VERSION
 		$_revision $_repository
 		$_q $_authors $_authors_prog %users/;
 $AUTHOR = 'Eric Wong <[email protected]>';
-$VERSION = '2.46.0.windows.1';
+$VERSION = '2.46.1.windows.1';
 
 use Carp qw/croak/;
 use File::Basename qw/dirname basename/;

diff --git a/mingw64/libexec/git-core/git.exe b/mingw64/libexec/git-core/git.exe
diff --git a/mingw64/libexec/git-core/headless-git.exe b/mingw64/libexec/git-core/headless-git.exe
diff --git a/mingw64/libexec/git-core/scalar.exe b/mingw64/libexec/git-core/scalar.exe
diff --git a/mingw64/share/doc/git-doc/DecisionMaking.html b/mingw64/share/doc/git-doc/DecisionMaking.html
@@ -541,7 +541,7 @@ <h2 id="_other_discussion_venues">Other Discussion Venues</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/MyFirstContribution.html b/mingw64/share/doc/git-doc/MyFirstContribution.html
@@ -2242,7 +2242,7 @@ <h3 id="after-approval"><a class="anchor" href="#after-approval"></a>After Revie
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/MyFirstObjectWalk.html b/mingw64/share/doc/git-doc/MyFirstObjectWalk.html
@@ -1678,7 +1678,7 @@ <h2 id="_wrapping_up">Wrapping Up</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/RelNotes/2.46.1.txt b/mingw64/share/doc/git-doc/RelNotes/2.46.1.txt
@@ -0,0 +1,75 @@
+Git 2.46.1 Release Notes
+========================
+
+This release is primarily to merge fixes accumulated on the 'master'
+front to prepare for 2.47 release that are still relevant to 2.46.x
+maintenance track.
+
+Fixes since Git 2.46
+--------------------
+
+ * "git checkout --ours" (no other arguments) complained that the
+   option is incompatible with branch switching, which is technically
+   correct, but found confusing by some users.  It now says that the
+   user needs to give pathspec to specify what paths to checkout.
+
+ * It has been documented that we avoid "VAR=VAL shell_func" and why.
+
+ * "git add -p" by users with diff.suppressBlankEmpty set to true
+   failed to parse the patch that represents an unmodified empty line
+   with an empty line (not a line with a single space on it), which
+   has been corrected.
+
+ * "git rebase --help" referred to "offset" (the difference between
+   the location a change was taken from and the change gets replaced)
+   incorrectly and called it "fuzz", which has been corrected.
+
+ * "git notes add -m '' --allow-empty" and friends that take prepared
+   data to create notes should not invoke an editor, but it started
+   doing so since Git 2.42, which has been corrected.
+
+ * An expensive operation to prepare tracing was done in re-encoding
+   code path even when the tracing was not requested, which has been
+   corrected.
+
+ * Perforce tests have been updated.
+
+ * The credential helper to talk to OSX keychain sometimes sent
+   garbage bytes after the username, which has been corrected.
+
+ * A recent update broke "git ls-remote" used outside a repository,
+   which has been corrected.
+
+ * "git config --value=foo --fixed-value section.key newvalue" barfed
+   when the existing value in the configuration file used the
+   valueless true syntax, which has been corrected.
+
+ * "git reflog expire" failed to honor annotated tags when computing
+   reachable commits.
+
+ * A flakey test and incorrect calls to strtoX() functions have been
+   fixed.
+
+ * Follow-up on 2.45.1 regression fix.
+
+ * "git rev-list ... | git diff-tree -p --remerge-diff --stdin" should
+   behave more or less like "git log -p --remerge-diff" but instead it
+   crashed, forgetting to prepare a temporary object store needed.
+
+ * The patch parser in "git patch-id" has been tightened to avoid
+   getting confused by lines that look like a patch header in the log
+   message.
+
+ * "git bundle unbundle" outside a repository triggered a BUG()
+   unnecessarily, which has been corrected.
+
+ * The code forgot to discard unnecessary in-core commit buffer data
+   for commits that "git log --skip=<number>" traversed but omitted
+   from the output, which has been corrected.
+
+ * "git verify-pack" and "git index-pack" started dying outside a
+   repository, which has been corrected.
+
+ * A corner case bug in "git stash" was fixed.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/mingw64/share/doc/git-doc/ReviewingGuidelines.html b/mingw64/share/doc/git-doc/ReviewingGuidelines.html
@@ -666,7 +666,7 @@ <h2 id="_see_also">See Also</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/SubmittingPatches.html b/mingw64/share/doc/git-doc/SubmittingPatches.html
@@ -1583,7 +1583,7 @@ <h3 id="_gnus">Gnus</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/ToolsForGit.html b/mingw64/share/doc/git-doc/ToolsForGit.html
@@ -523,7 +523,7 @@ <h4 id="_httpswww_kernel_orgdochtmlv4_10processcoding_style_htmlyou_ve_made_a_me
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/everyday.html b/mingw64/share/doc/git-doc/everyday.html
@@ -460,7 +460,7 @@ <h1>Everyday Git With 20 Commands Or So</h1>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-add.html b/mingw64/share/doc/git-doc/git-add.html
@@ -1030,7 +1030,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-am.html b/mingw64/share/doc/git-doc/git-am.html
@@ -869,7 +869,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-annotate.html b/mingw64/share/doc/git-doc/git-annotate.html
@@ -715,7 +715,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-apply.html b/mingw64/share/doc/git-doc/git-apply.html
@@ -836,7 +836,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-archimport.html b/mingw64/share/doc/git-doc/git-archimport.html
@@ -591,7 +591,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-archive.html b/mingw64/share/doc/git-doc/git-archive.html
@@ -764,7 +764,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-bash.html b/mingw64/share/doc/git-doc/git-bash.html
@@ -579,7 +579,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-bisect-lk2009.html b/mingw64/share/doc/git-doc/git-bisect-lk2009.html
@@ -2134,7 +2134,7 @@ <h2 id="_references">References</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-bisect.html b/mingw64/share/doc/git-doc/git-bisect.html
@@ -1091,7 +1091,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-blame.html b/mingw64/share/doc/git-doc/git-blame.html
@@ -1097,7 +1097,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-branch.html b/mingw64/share/doc/git-doc/git-branch.html
@@ -1126,7 +1126,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-bugreport.html b/mingw64/share/doc/git-doc/git-bugreport.html
@@ -570,7 +570,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-bundle.html b/mingw64/share/doc/git-doc/git-bundle.html
@@ -862,7 +862,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-cat-file.html b/mingw64/share/doc/git-doc/git-cat-file.html
@@ -821,9 +821,9 @@ <h2 id="_batch_output">BATCH OUTPUT</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>If <code>--batch</code> or <code>--batch-check</code> is given, <code>cat-file</code> will read objects
-from stdin, one per line, and print information about them. By default,
-the whole line is considered as an object, as if it were fed to
-<a href="git-rev-parse.html">git-rev-parse(1)</a>.</p>
+from stdin, one per line, and print information about them in the same
+order as they have been read. By default, the whole line is
+considered as an object, as if it were fed to <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p>
 </div>
 <div class="paragraph">
 <p>When <code>--batch-command</code> is given, <code>cat-file</code> will read commands from stdin,
@@ -1014,7 +1014,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-cat-file.txt b/mingw64/share/doc/git-doc/git-cat-file.txt
@@ -270,9 +270,9 @@ BATCH OUTPUT
 ------------
 
 If `--batch` or `--batch-check` is given, `cat-file` will read objects
-from stdin, one per line, and print information about them. By default,
-the whole line is considered as an object, as if it were fed to
-linkgit:git-rev-parse[1].
+from stdin, one per line, and print information about them in the same
+order as they have been read. By default, the whole line is
+considered as an object, as if it were fed to linkgit:git-rev-parse[1].
 
 When `--batch-command` is given, `cat-file` will read commands from stdin,
 one per line, and print information based on the command given. With

diff --git a/mingw64/share/doc/git-doc/git-check-attr.html b/mingw64/share/doc/git-doc/git-check-attr.html
@@ -658,7 +658,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-check-ignore.html b/mingw64/share/doc/git-doc/git-check-ignore.html
@@ -618,7 +618,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-check-mailmap.html b/mingw64/share/doc/git-doc/git-check-mailmap.html
@@ -519,7 +519,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-check-ref-format.html b/mingw64/share/doc/git-doc/git-check-ref-format.html
@@ -641,7 +641,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-checkout-index.html b/mingw64/share/doc/git-doc/git-checkout-index.html
@@ -693,7 +693,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-checkout.html b/mingw64/share/doc/git-doc/git-checkout.html
@@ -1280,7 +1280,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-cherry-pick.html b/mingw64/share/doc/git-doc/git-cherry-pick.html
@@ -824,7 +824,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-cherry.html b/mingw64/share/doc/git-doc/git-cherry.html
@@ -631,7 +631,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-29 18:18:09 UTC
+Last updated 2024-09-18 08:24:21 UTC
 </div>
 </div>
 </body>