summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-10-29 19:53:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-29 19:53:54 (GMT)
commite2b7eaf0ca3897940961d23392d4ff718867ea9f (patch)
treebf24e41872b28f8dc50db5f24e0222117da71da6 /merge-recursive.c
parent8371d8fd094548c1d02b8583fdbff8204a725ffc (diff)
parente720c4382f6c9317a3b495e80c7dfc609a0db5e6 (diff)
downloadgit-e2b7eaf0ca3897940961d23392d4ff718867ea9f.zip
git-e2b7eaf0ca3897940961d23392d4ff718867ea9f.tar.gz
git-e2b7eaf0ca3897940961d23392d4ff718867ea9f.tar.bz2
Merge branch 'maint'
* maint: RelNotes-1.5.3.5: describe recent fixes merge-recursive.c: mrtree in merge() is not used before set sha1_file.c: avoid gcc signed overflow warnings Fix a small memory leak in builtin-add honor the http.sslVerify option in shell scripts
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 4a5c77c..6c6f595 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1572,7 +1572,7 @@ static int merge(struct commit *h1,
{
struct commit_list *iter;
struct commit *merged_common_ancestors;
- struct tree *mrtree;
+ struct tree *mrtree = mrtree;
int clean;
if (show(4)) {