Merge branch 'ah/log-decorate-default-to-auto' into maint

diff --git a/builtin/log.c b/builtin/log.c
index cf2b736ca761194108740f435534b2bc8eb601a5..ec3258368ca96eb9120c64994b8132a6e00b5d24 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1091,8 +1091,7 @@ static const char *set_outdir(const char *prefix, const char *output_directory)
        if (!output_directory)
                return prefix;
 
-       return xstrdup(prefix_filename(prefix, outdir_offset,
-                                      output_directory));
+       return prefix_filename(prefix, output_directory);
 }
 
 static const char * const builtin_format_patch_usage[] = {