Merge branch 'jc/dirstat'

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

index 28c36fdcd1658968ff7c3e2f1d6ba6f364f99592..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
  };
@@ -50,12 +50,15 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
                 size_t len = strlen(editor);
                 int i = 0;
                 const char *args[6];
+               struct strbuf arg0;
  
+               strbuf_init(&arg0, 0);
                 if (strcspn(editor, "$ \t'") != len) {
                         /* there are specials */
+                       strbuf_addf(&arg0, "%s \"$@\"", editor);
                         args[i++] = "sh";
                         args[i++] = "-c";
-                       args[i++] = "$0 \"$@\"";
+                       args[i++] = arg0.buf;
                 }
                 args[i++] = editor;
                 args[i++] = path;
@@ -63,6 +66,7 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
  
                 if (run_command_v_opt_cd_env(args, 0, NULL, env))
                         die("There was a problem with the editor %s.", editor);
+               strbuf_release(&arg0);
         }
  
         if (!buffer)