Make git-tag a builtin.

Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252

This replaces the script "git-tag.sh" with "builtin-tag.c". It is based in a previous work on it from Kristian Høgsberg.

There are some minor changes in the behaviour of "git tag" here:
"git tag -v" now can get more than one tag to verify, like "git tag -d" did, "git tag" with no arguments prints all tags, more like "git branch" does, and the template for the edited message adds an empty line, like in "git commit".

builtin-tag.c new file +24 -0

+ *                    Carlos Rica <[email protected]>
+ * Based on git-tag.sh and mktag.c by Linus Torvalds.
+ */
+
+#include "cache.h"
+#include "builtin.h"
+#include "refs.h"
+#include "tag.h"
+#include "run-command.h"
+
+static const char builtin_tag_usage[] =
+  "git-tag [-n [<num>]] -l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg>] <tagname> [<head>]";
+
+static char signingkey[1000];
+static int lines;
+
+static void launch_editor(const char *path, char **buffer, unsigned long *len)
+{
+	const char *editor, *terminal;
+	struct child_process child;
+	const char *args[3];
+	int fd;
+
+	editor = getenv("VISUAL");

...

builtin-tag.c new file +5 -0

+}
+
+static int run_verify_tag_command(unsigned char *sha1)
+{
+	int ret;

builtin-tag.c new file +6 -0

+	memset(&gpg, 0, sizeof(gpg));
+	gpg.argv = args;
+	gpg.in = -1;
+	gpg.out = -1;
+	args[0] = "gpg";
+	args[1] = "-bsau";

builtin-tag.c new file +6 -0

+
+	finish_command(&gpg);
+
+	return size + len;
+}
+

builtin-tag.c new file +16 -0

+#define MAX_SIGNATURE_LENGTH 1024
+/* message must be NULL or allocated, it will be reallocated and freed */
+static void create_tag(const unsigned char *object, const char *tag,
+		       char *message, int sign, unsigned char *result)
+{
+	enum object_type type;
+	char header_buf[1024], *buffer;
+	int header_len, max_size;
+	unsigned long size;
+
+	type = sha1_object_info(object, NULL);
+	if (type <= 0)
+	    die("bad object type.");
+
+	header_len = snprintf(header_buf, sizeof header_buf,
+			  "object %s\n"

...
+}

Quoted 2 lines · Carlos Rica

Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252

Hmmmmmm.....

builtin-tag.c line 4

Quoted 10 lines

builtin-tag.c new file +4 -0

new file mode 100644
index 0000000..1824379
@@ -0,0 +1,430 @@
+/*
+ * Builtin "git tag"
+ *
+ * Copyright (c) 2007 Kristian H??gsberg <[email protected]>,

I do not know how the above would come out, but it surely was not Høgsberg in the copy I received...

Quoted 34 lines

builtin-tag.c new file +33 -0

+ *                    Carlos Rica <[email protected]>
+ * Based on git-tag.sh and mktag.c by Linus Torvalds.
+ */
+
+#include "cache.h"
+#include "builtin.h"
+#include "refs.h"
+#include "tag.h"
+#include "run-command.h"
+
+static const char builtin_tag_usage[] =
+  "git-tag [-n [<num>]] -l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg>] <tagname> [<head>]";
+
+static char signingkey[1000];
+static int lines;
+
+static void launch_editor(const char *path, char **buffer, unsigned long *len)
+{
+     const char *editor, *terminal;
+     struct child_process child;
+     const char *args[3];
+     int fd;
+
+     editor = getenv("VISUAL");
+     if (!editor)
+             editor = getenv("EDITOR");
+
+     terminal = getenv("TERM");
+     if (!editor && (!terminal || !strcmp(terminal, "dumb"))) {
+             fprintf(stderr,
+             "Terminal is dumb but no VISUAL nor EDITOR defined.\n"
+             "Please supply the message using either -m or -F option.\n");
+             exit(1);

builtin-tag.c line 38

Quoted 1 line

builtin-tag.c new file +1 -0

+     }

Ah, this is taken from git-commit.sh ;-) Does your "git tag" support the -F option (builtin_tag_usage[] does not seem to mention it)? I wonder what happens when this function migrates to editor.c and a new program, other than git-tag and git-commit, that is without -F nor -m options wants to call this.

Quoted 10 lines

builtin-tag.c new file +10 -0

+static int run_verify_tag_command(unsigned char *sha1)
+{
+     int ret;
+     const char *argv_verify_tag[] = {"git-verify-tag",
+                                     "-v", "SHA1_HEX", NULL};
+     argv_verify_tag[2] = sha1_to_hex(sha1);
+
+     ret = run_command_v_opt(argv_verify_tag, 0);
+
+     if (ret <= -10000)

builtin-tag.c line 164

Quoted 3 lines

builtin-tag.c new file +3 -0

+             die("unable to run %s\n", argv_verify_tag[0]);
+     return -ret;
+}

I wonder why you need to differentiate between ERR_RUN_COMMAND_* and non-zero exit status... Also do you need to "return -ret", instead of not negating? In C programs error returns are often negative and finish_command() follows that convention.

builtin-tag.c line 295

Quoted 13 lines

builtin-tag.c new file +11 -0

+     if (!message) {
...
+     }
+     else {
+             buffer = message;
+             size = strlen(message);
+     }
+
+     size = stripspace(buffer, size, 1);
+
+     if (!message && !size)
+             die("no tag message?");

Why check 'message' here?

Quoted 9 lines

builtin-tag.c new file +8 -0

+int cmd_tag(int argc, const char **argv, const char *prefix)
+{
...
+             if (!strcmp(arg, "-F")) {
+                     unsigned long len;
+                     annotate = 1;
+                     i++;
+                     if  (i == argc)
+                             die("option -F needs an argument.");

builtin-tag.c line 370

Quoted 4 lines

builtin-tag.c new file +4 -0

+
+                     fd = open(argv[i], O_RDONLY);
+                     if (fd < 0)
+                             die("cannot open %s", argv[1]);

The shell script version relies on the magic "cat -" to read from standard input upon "git tag -F -". It is understandable that both of you and Dscho missed it, though.

builtin-tag.c line 379

Quoted 8 lines

builtin-tag.c new file +8 -0

+                     len = 1024;
+                     message = xmalloc(len);
+                     if (read_pipe(fd, &message, &len))
+                             die("cannot read %s", argv[1]);
+                     message = xrealloc(message, len + 1);
+                     message[len] = '\0';
+                     continue;
+             }

We might be better off if read_pipe() is renamed to read_fd() and made internally always NUL-terminate the buffer (but not count that NUL as part of length). I dunno.