From e92fa514a9ade4526ad5c119e3f12e69621c97b6 Mon Sep 17 00:00:00 2001
From: Elijah Newren <newren@gmail.com>
Date: Mon, 6 Sep 2010 15:40:16 -0600
Subject: [PATCH 1/2] cache_tree_free: Fix small memory leak
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
cache-tree.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/cache-tree.c b/cache-tree.c
index c60cf9140dd..f755590da82 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -22,8 +22,10 @@ void cache_tree_free(struct cache_tree **it_p)
if (!it)
return;
for (i = 0; i < it->subtree_nr; i++)
- if (it->down[i])
+ if (it->down[i]) {
cache_tree_free(&it->down[i]->cache_tree);
+ free(it->down[i]);
+ }
free(it->down);
free(it);
*it_p = NULL;
From 04df568be53c42d07aea393effc7c5653f245d9a Mon Sep 17 00:00:00 2001
From: Elijah Newren <newren@gmail.com>
Date: Mon, 6 Sep 2010 15:53:24 -0600
Subject: [PATCH 2/2] revert: Fix trivial comment style issue
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/revert.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 8b9d829a73a..54d13cf5ef8 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -495,7 +495,6 @@ static int do_pick_commit(void)
free_message(&msg);
/*
- *
* If we are cherry-pick, and if the merge did not result in
* hand-editing, we will hit this commit and inherit the original
* author date and name.