Merge branch 'cr/tag'

* cr/tag:
  Teach "git stripspace" the --strip-comments option
  Make verify-tag a builtin.
  builtin-tag.c: Fix two memory leaks and minor notation changes.
  launch_editor(): Heed GIT_EDITOR and core.editor settings
  Make git tag a builtin.

1 files changed, 2 insertions, 0 deletions

diff --git a/cache.h b/cache.h
index e5276e6add..4507404240 100644
--- a/cache.h
+++ b/cache.h
@@ -569,6 +569,8 @@ extern char *pager_program;
 extern int pager_in_use;
 extern int pager_use_color;
 
+extern char *editor_program;
+
 /* base85 */
 int decode_85(char *dst, const char *line, int linelen);
 void encode_85(char *buf, const unsigned char *data, int bytes);