summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-07-09 00:59:58 -0700
committerJunio C Hamano <gitster@pobox.com>2009-07-09 00:59:58 -0700
commit128a9d86da3c156c7d1bf25692eeb68a522af935 (patch)
treec741913f11f81167c34ab306c35c8ed95eb88640 /diff.c
parentce4f404c6f059abb4988f4549c6e46a3ba0d56ec (diff)
parented24e401e0e6ab860475b8575e28a2c6ea99cc69 (diff)
downloadgit-128a9d86da3c156c7d1bf25692eeb68a522af935.tar.gz
Merge branch 'rs/grep-p'
* rs/grep-p: grep: simplify -p output grep -p: support user defined regular expressions grep: add option -p/--show-function grep: handle pre context lines on demand grep: print context hunk marks between files grep: move context hunk mark handling into show_line() userdiff: add xdiff_clear_find_func()
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 0a020ffab4..cd35e0c2d7 100644
--- a/diff.c
+++ b/diff.c
@@ -1603,6 +1603,7 @@ static void builtin_diff(const char *name_a,
free(mf1.ptr);
if (textconv_two)
free(mf2.ptr);
+ xdiff_clear_find_func(&xecfg);
}
free_ab_and_return: