aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-15 18:59:45 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-15 18:59:45 -0700
commit223bb84572c8b2058e175e8452913bcb1bdb0ade (patch)
treeec3704442ab81fdd9a1453878e0bd151dc019e62
parent1466080199c9e102515b8a0820d97eed86a8f678 (diff)
parentfdfd20080239c8564e40498bbaae63c1b87ccdba (diff)
downloadgit-223bb84572c8b2058e175e8452913bcb1bdb0ade.tar.gz
git-223bb84572c8b2058e175e8452913bcb1bdb0ade.tar.xz
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
-rw-r--r--builtin-tag.c10
-rw-r--r--convert.c4
-rwxr-xr-xgit-add--interactive.perl2
3 files changed, 15 insertions, 1 deletions
diff --git a/builtin-tag.c b/builtin-tag.c
index 3c97c696a..a70922b21 100644
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -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;
}
diff --git a/convert.c b/convert.c
index 352b69d4c..78efed800 100644
--- a/convert.c
+++ b/convert.c
@@ -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--;
}
/*
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index a6a5c52b5..da768ee7a 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -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 ? "\"$_\"": $_ } @_;