mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'sp/win'
* sp/win: We need to check for msys as well as Windows in add--interactive. Convert CR/LF to LF in tag signatures Fixed text file auto-detection: treat EOF character 032 at the end of file as printable
This commit is contained in:
commit
223bb84572
|
@ -202,6 +202,7 @@ static int do_sign(struct strbuf *buffer)
|
|||
const char *args[4];
|
||||
char *bracket;
|
||||
int len;
|
||||
int i, j;
|
||||
|
||||
if (!*signingkey) {
|
||||
if (strlcpy(signingkey, git_committer_info(IDENT_ERROR_ON_NO_NAME),
|
||||
|
@ -241,6 +242,15 @@ static int do_sign(struct strbuf *buffer)
|
|||
if (finish_command(&gpg) || !len || len < 0)
|
||||
return error("gpg failed to sign the tag");
|
||||
|
||||
/* Strip CR from the line endings, in case we are on Windows. */
|
||||
for (i = j = 0; i < buffer->len; i++)
|
||||
if (buffer->buf[i] != '\r') {
|
||||
if (i != j)
|
||||
buffer->buf[j] = buffer->buf[i];
|
||||
j++;
|
||||
}
|
||||
strbuf_setlen(buffer, j);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -61,6 +61,10 @@ static void gather_stats(const char *buf, unsigned long size, struct text_stat *
|
|||
else
|
||||
stats->printable++;
|
||||
}
|
||||
|
||||
/* If file ends with EOF then don't count this EOF as non-printable. */
|
||||
if (size >= 1 && buf[size-1] == '\032')
|
||||
stats->nonprintable--;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -54,7 +54,7 @@ sub colored {
|
|||
my $patch_mode;
|
||||
|
||||
sub run_cmd_pipe {
|
||||
if ($^O eq 'MSWin32') {
|
||||
if ($^O eq 'MSWin32' || $^O eq 'msys') {
|
||||
my @invalid = grep {m/[":*]/} @_;
|
||||
die "$^O does not support: @invalid\n" if @invalid;
|
||||
my @args = map { m/ /o ? "\"$_\"": $_ } @_;
|
||||
|
|
Loading…
Reference in a new issue