From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 9 Oct 2008 17:18:32 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~169
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=635536488c3efcf8495333b6a94e3e33c36fc055;p=git.git

Merge branch 'maint'

* maint:
  builtin-apply: fix typo leading to stack corruption
  git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
  builtin-merge.c: allocate correct amount of memory
  Makefile: do not set NEEDS_LIBICONV for Solaris 8
  rebase -i: remove leftover debugging
  rebase -i: proper prepare-commit-msg hook argument when squashing
---

635536488c3efcf8495333b6a94e3e33c36fc055
diff --cc builtin-merge.c
index dcf898778,d0bf1fc1e..fa7c95472
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@@ -727,10 -656,10 +727,10 @@@ static int merge_trivial(void
  	write_tree_trivial(result_tree);
  	printf("Wonderful.\n");
  	parent->item = lookup_commit(head);
- 	parent->next = xmalloc(sizeof(struct commit_list *));
+ 	parent->next = xmalloc(sizeof(*parent->next));
  	parent->next->item = remoteheads->item;
  	parent->next->next = NULL;
 -	commit_tree(merge_msg.buf, result_tree, parent, result_commit);
 +	commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL);
  	finish(result_commit, "In-index merge");
  	drop_save();
  	return 0;