diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-09 00:13:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-09 00:13:19 (GMT) |
| commit | 8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0 (patch) | |
| tree | 13daae95357e1877e57e742dd9ea77ca5d3e3b16 /builtin-revert.c | |
| parent | 3b8572a4297d8720b359c82e1dd9afeb45cda3cd (diff) | |
| parent | a4f34cbb4cea1f0b0e625b528f269f4b517c64f8 (diff) | |
| download | git-8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0.zip git-8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0.tar.gz git-8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0.tar.bz2 | |
Merge branch 'ar/maint-mksnpath' into maint
* 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
Fix potentially dangerous uses of mkpath and git_path
Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
Add mksnpath which allows you to specify the output buffer
Conflicts:
builtin-revert.c
rerere.c
Diffstat (limited to 'builtin-revert.c')
| -rw-r--r-- | builtin-revert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-revert.c b/builtin-revert.c index 786a956..74845ef 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -269,7 +269,7 @@ static int revert_or_cherry_pick(int argc, const char **argv) int i; char *oneline, *reencoded_message = NULL; const char *message, *encoding; - char *defmsg = xstrdup(git_path("MERGE_MSG")); + char *defmsg = git_pathdup("MERGE_MSG"); git_config(git_default_config, NULL); me = action == REVERT ? "revert" : "cherry-pick"; |