summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2008-10-27 10:22:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-10-31 00:52:24 (GMT)
commita4f34cbb4cea1f0b0e625b528f269f4b517c64f8 (patch)
treed17b28dc28f2f182c169030bd618a625a65b865c /rerere.c
parentaba13e7c0566f578f866504bfcb388a72f7e5079 (diff)
downloadgit-a4f34cbb4cea1f0b0e625b528f269f4b517c64f8.zip
git-a4f34cbb4cea1f0b0e625b528f269f4b517c64f8.tar.gz
git-a4f34cbb4cea1f0b0e625b528f269f4b517c64f8.tar.bz2
Use git_pathdup instead of xstrdup(git_path(...))
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rerere.c b/rerere.c
index 323e493..3d6ee8f 100644
--- a/rerere.c
+++ b/rerere.c
@@ -345,7 +345,7 @@ int setup_rerere(struct string_list *merge_rr)
if (!is_rerere_enabled())
return -1;
- merge_rr_path = xstrdup(git_path("MERGE_RR"));
+ merge_rr_path = git_pathdup("MERGE_RR");
fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
read_rr(merge_rr);
return fd;