Merge branch 'jk/sha1dc'

diff --git a/builtin/log.c b/builtin/log.c
index 281af8c1ecb04c7be05d9a17a1d5f3bd43420c85..670229cbb4c2a80e7389bc9d65f92455d1d34427 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1084,8 +1084,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[] = {