summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-27 21:03:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-27 21:03:50 (GMT)
commit3d0a936f63f2f894b3986d96cdd8f2baae96150c (patch)
treef661256c3756d9d74ea2cd045115e5488f53388f /pretty.c
parent60b188a9844cdcf865174c685a38acc053a9d43b (diff)
parent8e0f70033b2bd1679a6e5971978fdc3ee09bdb72 (diff)
downloadgit-3d0a936f63f2f894b3986d96cdd8f2baae96150c.zip
git-3d0a936f63f2f894b3986d96cdd8f2baae96150c.tar.gz
git-3d0a936f63f2f894b3986d96cdd8f2baae96150c.tar.bz2
Merge branch 'jm/free'
* jm/free: Avoid unnecessary "if-before-free" tests. Conflicts: builtin-branch.c
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/pretty.c b/pretty.c
index a5b2d8c..703f521 100644
--- a/pretty.c
+++ b/pretty.c
@@ -30,8 +30,7 @@ enum cmit_fmt get_commit_format(const char *arg)
if (*arg == '=')
arg++;
if (!prefixcmp(arg, "format:")) {
- if (user_format)
- free(user_format);
+ free(user_format);
user_format = xstrdup(arg + 7);
return CMIT_FMT_USERFORMAT;
}