From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 11 Aug 2007 06:17:46 +0000 (-0700)
Subject: Merge branch 'cr/tag'
X-Git-Tag: v1.5.3-rc5~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55d1932bce99d83fa0d891331fe3f3562d33af2e;p=thirdparty%2Fgit.git

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.
---

55d1932bce99d83fa0d891331fe3f3562d33af2e
diff --cc environment.c
index 2af12fd689,35d3f4b595..b5a6c69f7c
--- a/environment.c
+++ b/environment.c
@@@ -33,12 -33,9 +33,13 @@@ size_t delta_base_cache_limit = 16 * 10
  char *pager_program;
  int pager_in_use;
  int pager_use_color = 1;
+ char *editor_program;
  int auto_crlf = 0;	/* 1: both ways, -1: only when adding git objects */
  
 +/* This is set by setup_git_dir_gently() and/or git_default_config() */
 +char *git_work_tree_cfg;
 +static const char *work_tree;
 +
  static const char *git_dir;
  static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;