Merge branch 'jc/add-addremove'

[git.git] / builtin-tag.c
diff --git a/builtin-tag.c b/builtin-tag.c

index 3c97c696a50cb55e78774c743436cf50cad35f96..c2cca6cb6dc46a221c65092d7c419445d6442b5f 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -14,10 +14,10 @@
  #include "parse-options.h"
  
  static const char * const git_tag_usage[] = {
-       "git-tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]",
-       "git-tag -d <tagname>...",
-       "git-tag -l [-n[<num>]] [<pattern>]",
-       "git-tag -v <tagname>...",
+       "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]",
+       "git tag -d <tagname>...",
+       "git tag -l [-n[<num>]] [<pattern>]",
+       "git tag -v <tagname>...",
         NULL
  };
  
@@ -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;
  }