From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 31 Oct 2008 08:42:58 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~105
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=933bb3ae5e6c83288ec7c80c2282984f4927cb48;p=git.git

Merge branch 'maint'

* maint:
  git-svn: change dashed git-commit-tree to git commit-tree
  Documentation: clarify information about 'ident' attribute
  bash completion: add doubledash to "git show"
  Use test-chmtime -v instead of perl in t5000 to get mtime of a file
  Add --verbose|-v to test-chmtime
  asciidoc: add minor workaround to add an empty line after code blocks
  Plug a memleak in builtin-revert
  Add file delete/create info when we overflow rename_limit
  Install git-cvsserver in $(bindir)
  Install git-shell in bindir, too
---

933bb3ae5e6c83288ec7c80c2282984f4927cb48
diff --cc builtin-revert.c
index 472554019,c41788685..7483a7a63
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@@ -248,13 -266,10 +248,13 @@@ static int revert_or_cherry_pick(int ar
  {
  	unsigned char head[20];
  	struct commit *base, *next, *parent;
 -	int i;
 +	int i, index_fd, clean;
  	char *oneline, *reencoded_message = NULL;
  	const char *message, *encoding;
- 	const char *defmsg = xstrdup(git_path("MERGE_MSG"));
+ 	char *defmsg = xstrdup(git_path("MERGE_MSG"));
 +	struct merge_options o;
 +	struct tree *result, *next_tree, *base_tree, *head_tree;
 +	static struct lock_file index_lock;
  
  	git_config(git_default_config, NULL);
  	me = action == REVERT ? "revert" : "cherry-pick";