Merge branch 'jm/free'

* jm/free:
  Avoid unnecessary "if-before-free" tests.

Conflicts:

	builtin-branch.c

1 files changed, 1 insertions, 2 deletions

diff --git a/pretty.c b/pretty.c
index a5b2d8c604..703f52176b 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;
 	}