add tests of commit --squash

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 84195e47aa0a0e2fbeeb8a56d255ff5c6f42efe7..ea03b9107eb2e85dd4a4c5ad93ac08dfe7e1c9f0 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -269,9 +269,8 @@ static void diffcore_pickaxe_count(struct diff_options *o)
                                diff_free_filepair(p);
                }
 
-       if (opts & DIFF_PICKAXE_REGEX) {
+       if (opts & DIFF_PICKAXE_REGEX)
                regfree(&regex);
-       }
 
        free(q->queue);
        *q = outq;
@@ -282,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);
 }