summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2010-10-04 17:51:48 -0500
committerJunio C Hamano <gitster@pobox.com>2010-10-06 13:45:18 -0700
commit8520913cc53e03dcc4b4395cdf500ab8e60ed792 (patch)
tree977f3de7b72ec19023a86f05ee602dfeff1a50d4
parentdd15c7fffc9d357956df20a656b55e89db8c6f64 (diff)
downloadgit-8520913cc53e03dcc4b4395cdf500ab8e60ed792.tar.gz
diffcore-pickaxe.c: a void function shouldn't try to return something
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--diffcore-pickaxe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 38570999c3..ea03b9107e 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -281,7 +281,7 @@ void diffcore_pickaxe(struct diff_options *o)
{
/* Might want to warn when both S and G are on; I don't care... */
if (o->pickaxe_opts & DIFF_PICKAXE_KIND_G)
- return diffcore_pickaxe_grep(o);
+ diffcore_pickaxe_grep(o);
else
- return diffcore_pickaxe_count(o);
+ diffcore_pickaxe_count(o);
}