summaryrefslogtreecommitdiff
path: root/builtin/prune.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-14 11:53:53 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-14 11:53:53 -0700
commit8c11b25de41857e5a44325046dd55d3751f740c6 (patch)
tree066d739a7361b0341b84ad19ad0d62ad04c1f366 /builtin/prune.c
parent0ca416f166df7e96d9115a1fe213720f09a1417b (diff)
parent4e2d094dde4f078245d057dd6111ab9d013ae6d0 (diff)
downloadgit-8c11b25de41857e5a44325046dd55d3751f740c6.tar.gz
Merge branch 'rj/path-cleanup'
* rj/path-cleanup: Call mkpathdup() rather than xstrdup(mkpath(...)) Call git_pathdup() rather than xstrdup(git_path("...")) path.c: Use vsnpath() in the implementation of git_path() path.c: Don't discard the return value of vsnpath() path.c: Remove the 'git_' prefix from a file scope function
Diffstat (limited to 'builtin/prune.c')
-rw-r--r--builtin/prune.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/prune.c b/builtin/prune.c
index 9a03d24dad..8cb8b9186a 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -169,7 +169,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
prune_packed_objects(show_only);
remove_temporary_files(get_object_directory());
- s = xstrdup(mkpath("%s/pack", get_object_directory()));
+ s = mkpathdup("%s/pack", get_object_directory());
remove_temporary_files(s);
free(s);
return 0;