Skip to content

Commit

Permalink
Update 3 packages
Browse files Browse the repository at this point in the history
mingw-w64-clang-aarch64-git (2.47.1.1.2cd22437f6-1 -> 2.48.0.rc0.windows.1-1)
mingw-w64-clang-aarch64-git-doc-html (2.47.1.1.2cd22437f6-1 -> 2.48.0.rc0.windows.1-1)
mingw-w64-clang-aarch64-libiconv (1.17-4 -> 1.18-1)

Signed-off-by: Git for Windows Build Agent <[email protected]>
  • Loading branch information
Git for Windows Build Agent committed Dec 18, 2024
1 parent 359bd5a commit 615d6d7
Show file tree
Hide file tree
Showing 395 changed files with 9,380 additions and 7,554 deletions.
4 changes: 2 additions & 2 deletions clangarm64/bin/git-cvsserver
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ BEGIN {
####
####

use 5.008001;
require v5.26;
use strict;
use warnings;
use bytes;
Expand All @@ -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.47.1.windows.1';
my $VERSION = '2.48.0.rc0.windows.1';

my $log = GITCVS::log->new();
my $cfg;
Expand Down
Binary file modified clangarm64/bin/git-receive-pack.exe
Binary file not shown.
Binary file modified clangarm64/bin/git-shell.exe
Binary file not shown.
Binary file modified clangarm64/bin/git-upload-archive.exe
Binary file not shown.
Binary file modified clangarm64/bin/git-upload-pack.exe
Binary file not shown.
Binary file modified clangarm64/bin/git.exe
Binary file not shown.
Binary file modified clangarm64/bin/libcharset-1.dll
Binary file not shown.
Binary file modified clangarm64/bin/libiconv-2.dll
Binary file not shown.
Binary file modified clangarm64/bin/scalar.exe
Binary file not shown.
72 changes: 37 additions & 35 deletions clangarm64/include/iconv.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 1999-2022 Free Software Foundation, Inc.
/* Copyright (C) 1999-2024 Free Software Foundation, Inc.
This file is part of the GNU LIBICONV Library.
The GNU LIBICONV Library is free software; you can redistribute it
Expand All @@ -20,25 +20,28 @@
#ifndef _LIBICONV_H
#define _LIBICONV_H

#define _LIBICONV_VERSION 0x0111 /* version number: (major<<8) + minor */
#ifdef __cplusplus
extern "C" {
#endif

#define _LIBICONV_VERSION 0x0112 /* version number: (major<<8) + minor */
extern __declspec (dllimport) int _libiconv_version; /* Likewise */

#ifdef __cplusplus
}
#endif

/* We would like to #include any system header file which could define
iconv_t, 1. in order to eliminate the risk that the user gets compilation
iconv_t, in order to eliminate the risk that the user gets compilation
errors because some other system header file includes /usr/include/iconv.h
which defines iconv_t or declares iconv after this file, 2. when compiling
for LIBICONV_PLUG, we need the proper iconv_t type in order to produce
binary compatible code.
which defines iconv_t or declares iconv after this file.
But gcc's #include_next is not portable. Thus, once libiconv's iconv.h
has been installed in /usr/local/include, there is no way any more to
include the original /usr/include/iconv.h. We simply have to get away
without it.
Ad 1. The risk that a system header file does
The risk that a system header file does
#include "iconv.h" or #include_next "iconv.h"
is small. They all do #include <iconv.h>.
Ad 2. The iconv_t type is a pointer type in all cases I have seen. (It
has to be a scalar type because (iconv_t)(-1) is a possible return value
from iconv_open().) */
is small. They all do #include <iconv.h>. */

/* Define iconv_t ourselves. */
#undef iconv_t
Expand Down Expand Up @@ -66,25 +69,19 @@ extern "C" {

/* Allocates descriptor for code conversion from encoding ‘fromcode’ to
encoding ‘tocode’. */
#ifndef LIBICONV_PLUG
#define iconv_open libiconv_open
#endif
extern iconv_t iconv_open (const char* tocode, const char* fromcode);

/* Converts, using conversion descriptor ‘cd’, at most ‘*inbytesleft’ bytes
starting at ‘*inbuf’, writing at most ‘*outbytesleft’ bytes starting at
‘*outbuf’.
Decrements ‘*inbytesleft’ and increments ‘*inbuf’ by the same amount.
Decrements ‘*outbytesleft’ and increments ‘*outbuf’ by the same amount. */
#ifndef LIBICONV_PLUG
#define iconv libiconv
#endif
extern size_t iconv (iconv_t cd, char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);

/* Frees resources allocated for conversion descriptor ‘cd’. */
#ifndef LIBICONV_PLUG
#define iconv_close libiconv_close
#endif
extern int iconv_close (iconv_t cd);


Expand All @@ -93,8 +90,6 @@ extern int iconv_close (iconv_t cd);
#endif


#ifndef LIBICONV_PLUG

/* Nonstandard extensions. */

#if 1
Expand Down Expand Up @@ -165,7 +160,6 @@ typedef void (*iconv_unicode_uc_to_mb_fallback)
void* callback_arg),
void* callback_arg,
void* data);
#if 1
/* Fallback function. Invoked when a number of bytes could not be converted to
a wide character. This function should process all bytes from inbuf and may
produce replacement wide characters by calling the write_replacement
Expand All @@ -186,12 +180,6 @@ typedef void (*iconv_wchar_wc_to_mb_fallback)
void* callback_arg),
void* callback_arg,
void* data);
#else
/* If the wchar_t type does not exist, these two fallback functions are never
invoked. Their argument list therefore does not matter. */
typedef void (*iconv_wchar_mb_to_wc_fallback) ();
typedef void (*iconv_wchar_wc_to_mb_fallback) ();
#endif
/* Set of fallbacks. */
struct iconv_fallbacks {
iconv_unicode_mb_to_uc_fallback mb_to_uc_fallback;
Expand All @@ -201,14 +189,30 @@ struct iconv_fallbacks {
void* data;
};

/* Surfaces.
The concept of surfaces is described in the 'recode' manual. */
#define ICONV_SURFACE_NONE 0
/* In EBCDIC encodings, 0x15 (which encodes the "newline function", see the
Unicode standard, chapter 5) maps to U+000A instead of U+0085. This is
for interoperability with C programs and Unix environments on z/OS. */
#define ICONV_SURFACE_EBCDIC_ZOS_UNIX 1

/* Requests for iconvctl. */
#define ICONV_TRIVIALP 0 /* int *argument */
#define ICONV_GET_TRANSLITERATE 1 /* int *argument */
#define ICONV_SET_TRANSLITERATE 2 /* const int *argument */
#define ICONV_GET_DISCARD_ILSEQ 3 /* int *argument */
#define ICONV_SET_DISCARD_ILSEQ 4 /* const int *argument */
#define ICONV_SET_HOOKS 5 /* const struct iconv_hooks *argument */
#define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */
#define ICONV_TRIVIALP 0 /* int *argument */
#define ICONV_GET_TRANSLITERATE 1 /* int *argument */
#define ICONV_SET_TRANSLITERATE 2 /* const int *argument */
#define ICONV_GET_DISCARD_ILSEQ 3 /* int *argument */
#define ICONV_SET_DISCARD_ILSEQ 4 /* const int *argument */
#define ICONV_SET_HOOKS 5 /* const struct iconv_hooks *argument */
#define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */
#define ICONV_GET_FROM_SURFACE 7 /* unsigned int *argument */
#define ICONV_SET_FROM_SURFACE 8 /* const unsigned int *argument */
#define ICONV_GET_TO_SURFACE 9 /* unsigned int *argument */
#define ICONV_SET_TO_SURFACE 10 /* const unsigned int *argument */
#define ICONV_GET_DISCARD_INVALID 11 /* int *argument */
#define ICONV_SET_DISCARD_INVALID 12 /* const int *argument */
#define ICONV_GET_DISCARD_NON_IDENTICAL 13 /* int *argument */
#define ICONV_SET_DISCARD_NON_IDENTICAL 14 /* const int *argument */

/* Listing of locale independent encodings. */
#define iconvlist libiconvlist
Expand All @@ -235,7 +239,5 @@ extern void libiconv_set_relocation_prefix (const char *orig_prefix,
}
#endif

#endif


#endif /* _LIBICONV_H */
Binary file modified clangarm64/lib/libcharset.a
Binary file not shown.
Binary file modified clangarm64/lib/libcharset.dll.a
Binary file not shown.
Binary file modified clangarm64/lib/libiconv.a
Binary file not shown.
Binary file modified clangarm64/lib/libiconv.dll.a
Binary file not shown.
2 changes: 1 addition & 1 deletion clangarm64/lib/pkgconfig/iconv.pc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ includedir=${prefix}/include
Name: iconv
Description: libiconv
URL: https://www.gnu.org/software/libiconv/
Version: 1.17
Version: 1.18
Libs: -L${libdir} -liconv
Cflags: -I${includedir}
2 changes: 1 addition & 1 deletion clangarm64/libexec/git-core/git-archimport
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ and can contain multiple, unrelated branches.
=cut

use 5.008001;
require v5.26;
use strict;
use warnings;
use Getopt::Std;
Expand Down
Binary file modified clangarm64/libexec/git-core/git-credential-wincred.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion clangarm64/libexec/git-core/git-cvsexportcommit
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ BEGIN {

# END RUNTIME_PREFIX generated code.

use 5.008001;
require v5.26;
use strict;
use warnings;
use Getopt::Std;
Expand Down
2 changes: 1 addition & 1 deletion clangarm64/libexec/git-core/git-cvsimport
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ BEGIN {
# The head revision is on branch "origin" by default.
# You can change that with the '-o' option.

use 5.008001;
require v5.26;
use strict;
use warnings;
use Getopt::Long;
Expand Down
4 changes: 2 additions & 2 deletions clangarm64/libexec/git-core/git-cvsserver
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ BEGIN {
####
####

use 5.008001;
require v5.26;
use strict;
use warnings;
use bytes;
Expand All @@ -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.47.1.windows.1';
my $VERSION = '2.48.0.rc0.windows.1';

my $log = GITCVS::log->new();
my $cfg;
Expand Down
Binary file modified clangarm64/libexec/git-core/git-daemon.exe
Binary file not shown.
8 changes: 2 additions & 6 deletions clangarm64/libexec/git-core/git-difftool--helper
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ launch_merge_tool () {
export BASE
eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
else
initialize_merge_tool "$merge_tool"
# ignore the error from the above --- run_merge_tool
# will diagnose unusable tool by itself
initialize_merge_tool "$merge_tool" || exit 1
run_merge_tool "$merge_tool"
fi
}
Expand All @@ -87,9 +85,7 @@ if test -n "$GIT_DIFFTOOL_DIRDIFF"
then
LOCAL="$1"
REMOTE="$2"
initialize_merge_tool "$merge_tool"
# ignore the error from the above --- run_merge_tool
# will diagnose unusable tool by itself
initialize_merge_tool "$merge_tool" || exit 1
run_merge_tool "$merge_tool" false

status=$?
Expand Down
Binary file modified clangarm64/libexec/git-core/git-http-backend.exe
Binary file not shown.
Binary file modified clangarm64/libexec/git-core/git-http-fetch.exe
Binary file not shown.
Binary file modified clangarm64/libexec/git-core/git-http-push.exe
Binary file not shown.
Binary file modified clangarm64/libexec/git-core/git-imap-send.exe
Binary file not shown.
12 changes: 9 additions & 3 deletions clangarm64/libexec/git-core/git-mergetool--lib
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ check_unchanged () {
}

valid_tool () {
setup_tool "$1" && return 0
setup_tool "$1" 2>/dev/null && return 0
cmd=$(get_merge_tool_cmd "$1")
test -n "$cmd"
}
Expand Down Expand Up @@ -250,7 +250,12 @@ setup_tool () {
. "$MERGE_TOOLS_DIR/${tool%[0-9]}"
else
setup_user_tool
return $?
rc=$?
if test $rc -ne 0
then
echo >&2 "error: ${TOOL_MODE}tool.$tool.cmd not set for tool '$tool'"
fi
return $rc
fi

# Now let the user override the default command for the tool. If
Expand All @@ -259,6 +264,7 @@ setup_tool () {

if ! list_tool_variants | grep -q "^$tool$"
then
echo "error: unknown tool variant '$tool'" >&2
return 1
fi

Expand Down Expand Up @@ -474,7 +480,7 @@ get_merge_tool_path () {
merge_tool="$1"
if ! valid_tool "$merge_tool"
then
echo >&2 "Unknown merge tool $merge_tool"
echo >&2 "Unknown $TOOL_MODE tool $merge_tool"
exit 1
fi
if diff_mode
Expand Down
Binary file modified clangarm64/libexec/git-core/git-remote-ftp.exe
Binary file not shown.
Binary file modified clangarm64/libexec/git-core/git-remote-ftps.exe
Binary file not shown.
Binary file modified clangarm64/libexec/git-core/git-remote-http.exe
Binary file not shown.
Binary file modified clangarm64/libexec/git-core/git-remote-https.exe
Binary file not shown.
4 changes: 2 additions & 2 deletions clangarm64/libexec/git-core/git-send-email
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ BEGIN {
# and second line is the subject of the message.
#

use 5.008001;
require v5.26;
use strict;
use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use Getopt::Long;
Expand Down Expand Up @@ -1544,7 +1544,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.47.1.windows.1';
my $gitversion = '2.48.0.rc0.windows.1';
if ($gitversion =~ m/..GIT_VERSION../) {
$gitversion = Git::version();
}
Expand Down
Binary file modified clangarm64/libexec/git-core/git-sh-i18n--envsubst.exe
Binary file not shown.
Binary file modified clangarm64/libexec/git-core/git-shell.exe
Binary file not shown.
4 changes: 2 additions & 2 deletions clangarm64/libexec/git-core/git-svn
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ BEGIN {
# END RUNTIME_PREFIX generated code.
# Copyright (C) 2006, Eric Wong <[email protected]>
# License: GPL v2 or later
use 5.008001;
require v5.26;
use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use strict;
use vars qw/ $AUTHOR $VERSION
$oid $oid_short $oid_length
$_revision $_repository
$_q $_authors $_authors_prog %users/;
$AUTHOR = 'Eric Wong <[email protected]>';
$VERSION = '2.47.1.windows.1';
$VERSION = '2.48.0.rc0.windows.1';

use Carp qw/croak/;
use File::Basename qw/dirname basename/;
Expand Down
Binary file modified clangarm64/libexec/git-core/git.exe
Binary file not shown.
Binary file modified clangarm64/libexec/git-core/headless-git.exe
Binary file not shown.
Binary file modified clangarm64/libexec/git-core/scalar.exe
Binary file not shown.
21 changes: 20 additions & 1 deletion clangarm64/share/doc/git-doc/BreakingChanges.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,29 @@ over time. If circumstances change, an earlier decision to deprecate or change
something may need to be revisited from time to time. So do not take items on
this list to mean "it is settled, do not waste our time bringing it up again".

== Procedure

Discussing the desire to make breaking changes, declaring that breaking
changes are made at a certain version boundary, and recording these
decisions in this document, are necessary but not sufficient.
Because such changes are expected to be numerous, and the design and
implementation of them are expected to span over time, they have to
be deployable trivially at such a version boundary.

The breaking changes MUST be guarded with the a compile-time switch,
WITH_BREAKING_CHANGES, to help this process. When built with it,
the resulting Git binary together with its documentation would
behave as if these breaking changes slated for the next big version
boundary are already in effect. We may also want to have a CI job
or two to exercise the work-in-progress version of Git with these
breaking changes.


== Git 3.0

The following subsections document upcoming breaking changes for Git 3.0. There
is no planned release date for this breaking version yet.
is no planned release date for this breaking version yet. The early
adopter configuration used for changes for this release is `feature.git3`.

Proposed changes and removals only include items which are "ready" to be done.
In other words, this is not supposed to be a wishlist of features that should
Expand Down
5 changes: 1 addition & 4 deletions clangarm64/share/doc/git-doc/DecisionMaking.html
Original file line number Diff line number Diff line change
Expand Up @@ -442,9 +442,6 @@
<body class="article">
<div id="header">
<h1>Decision-Making Process in the Git Project</h1>
<div class="details">
<span id="revdate">2018-06-07</span>
</div>
</div>
<div id="content">
<div class="sect1">
Expand Down Expand Up @@ -541,7 +538,7 @@ <h2 id="_other_discussion_venues">Other Discussion Venues</h2>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2024-11-25 13:28:25 UTC
Last updated 2024-12-17 12:02:13 UTC
</div>
</div>
</body>
Expand Down
Loading

0 comments on commit 615d6d7

Please sign in to comment.