diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-27 13:03:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 13:03:50 -0800 |
| commit | 3d0a936f63f2f894b3986d96cdd8f2baae96150c (patch) | |
| tree | f661256c3756d9d74ea2cd045115e5488f53388f /xdiff-interface.c | |
| parent | 60b188a9844cdcf865174c685a38acc053a9d43b (diff) | |
| parent | 8e0f70033b2bd1679a6e5971978fdc3ee09bdb72 (diff) | |
| download | git-3d0a936f63f2f894b3986d96cdd8f2baae96150c.tar.gz | |
Merge branch 'jm/free'
* jm/free:
Avoid unnecessary "if-before-free" tests.
Conflicts:
builtin-branch.c
Diffstat (limited to 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 4b8e5cca80..bba236428a 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -233,8 +233,7 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value) expression = value; if (regcomp(®->re, expression, 0)) die("Invalid regexp to look for hunk header: %s", expression); - if (buffer) - free(buffer); + free(buffer); value = ep + 1; } } |