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 /builtin-blame.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 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index 59d7237f21..bfd562d7d2 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -123,8 +123,7 @@ static inline struct origin *origin_incref(struct origin *o) static void origin_decref(struct origin *o) { if (o && --o->refcnt <= 0) { - if (o->file.ptr) - free(o->file.ptr); + free(o->file.ptr); free(o); } } |