summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-06 19:10:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-06 19:10:02 (GMT)
commit90215bf3008f0986a5a8414d6ea1523148f74826 (patch)
tree28ccc42636720fd840fca860db90c23fcda3b23b /diffcore-pickaxe.c
parent931c103320e7be6318f3ea107f0701e283b64f35 (diff)
parent6db2103f92cf6c5caeeddec0bfd5f57f94e81d81 (diff)
downloadgit-90215bf3008f0986a5a8414d6ea1523148f74826.zip
git-90215bf3008f0986a5a8414d6ea1523148f74826.tar.gz
git-90215bf3008f0986a5a8414d6ea1523148f74826.tar.bz2
Merge branch 'maint'
* maint: Documentation/git-clone: describe --mirror more verbosely do not depend on signed integer overflow work around buggy S_ISxxx(m) implementations xdiff: cast arguments for ctype functions to unsigned char init: plug tiny one-time memory leak diffcore-pickaxe.c: remove unnecessary curly braces t3020 (ls-files-error-unmatch): remove stray '1' from end of file setup: make sure git dir path is in a permanent buffer environment.c: remove unused variable git-svn: fix processing of decorated commit hashes git-svn: check_cherry_pick should exclude commits already in our history Documentation/git-svn: discourage "noMetadata"
Diffstat (limited to 'diffcore-pickaxe.c')
-rw-r--r--diffcore-pickaxe.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 84195e4..3857099 100644
--- 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;