send-email: more meaningful Message-ID

diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 1646d5b25e4fe66cdb84a09aba87cb2f09f8c572..25aa2cdef3557c67a9482492a4d0294bc7b89b04 100644 (file)
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -66,8 +66,11 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
                        continue;
                }
 
-               if (!memcmp(arg, "-S", 2)) {
-                       sign_commit = arg + 2;
+               if (skip_prefix(arg, "-S", &sign_commit))
+                       continue;
+
+               if (!strcmp(arg, "--no-gpg-sign")) {
+                       sign_commit = NULL;
                        continue;
                }
 
@@ -118,8 +121,8 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
                        die_errno("git commit-tree: failed to read");
        }
 
-       if (commit_tree(&buffer, tree_sha1, parents, commit_sha1,
-                       NULL, sign_commit)) {
+       if (commit_tree(buffer.buf, buffer.len, tree_sha1, parents,
+                       commit_sha1, NULL, sign_commit)) {
                strbuf_release(&buffer);
                return 1;
        }