summaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-30 18:08:58 -0700
committerJunio C Hamano <gitster@pobox.com>2008-10-30 18:08:58 -0700
commit98b35e2c749614446b916230148d66857e8a09f3 (patch)
tree3cf15ee4e22a7ebf84e92b019a26ef424d540857 /builtin-revert.c
parent058412d09748c90be996a70729b961adad084175 (diff)
parenta4f34cbb4cea1f0b0e625b528f269f4b517c64f8 (diff)
downloadgit-98b35e2c749614446b916230148d66857e8a09f3.tar.gz
Merge branch 'ar/maint-mksnpath' into ar/mksnpath
* ar/maint-mksnpath: Use git_pathdup instead of xstrdup(git_path(...)) git_pathdup: returns xstrdup-ed copy of the formatted path Fix potentially dangerous use of git_path in ref.c Add git_snpath: a .git path formatting routine with output buffer Conflicts: builtin-revert.c refs.c rerere.c
Diffstat (limited to 'builtin-revert.c')
-rw-r--r--builtin-revert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index 472554019a..7e50c2aa54 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -251,7 +251,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
int i, index_fd, clean;
char *oneline, *reencoded_message = NULL;
const char *message, *encoding;
- const char *defmsg = xstrdup(git_path("MERGE_MSG"));
+ const char *defmsg = git_pathdup("MERGE_MSG");
struct merge_options o;
struct tree *result, *next_tree, *base_tree, *head_tree;
static struct lock_file index_lock;