diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-10-06 12:10:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-06 12:10:02 -0700 |
| commit | 90215bf3008f0986a5a8414d6ea1523148f74826 (patch) | |
| tree | 28ccc42636720fd840fca860db90c23fcda3b23b /diffcore-pickaxe.c | |
| parent | Merge branch 'work/pt/for-junio' of git://repo.or.cz/git/mingw/4msysgit (diff) | |
| parent | Documentation/git-clone: describe --mirror more verbosely (diff) | |
| download | tgif-90215bf3008f0986a5a8414d6ea1523148f74826.tar.xz | |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 84195e47aa..38570999c3 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(®ex); - } free(q->queue); *q = outq; |