Merge branch 'jc/dirstat'

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

index 9a59caf70d74cae9b7eae858402233ad6f7c3984..129ff57f11d2cdfdacc6be9685736ada07caef7f 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -16,7 +16,7 @@
  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 -l [-n[<num>]] [<pattern>]",
         "git-tag -v <tagname>...",
         NULL
  };
@@ -230,19 +230,17 @@ static int do_sign(struct strbuf *buffer)
  
         if (write_in_full(gpg.in, buffer->buf, buffer->len) != buffer->len) {
                 close(gpg.in);
+               close(gpg.out);
                 finish_command(&gpg);
                 return error("gpg did not accept the tag data");
         }
         close(gpg.in);
-       gpg.close_in = 0;
         len = strbuf_read(buffer, gpg.out, 1024);
+       close(gpg.out);
  
         if (finish_command(&gpg) || !len || len < 0)
                 return error("gpg failed to sign the tag");
  
-       if (len < 0)
-               return error("could not read the entire signature from gpg.");
-
         return 0;
  }