diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-14 11:53:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 11:53:53 -0700 |
| commit | 8c11b25de41857e5a44325046dd55d3751f740c6 (patch) | |
| tree | 066d739a7361b0341b84ad19ad0d62ad04c1f366 /builtin/branch.c | |
| parent | 0ca416f166df7e96d9115a1fe213720f09a1417b (diff) | |
| parent | 4e2d094dde4f078245d057dd6111ab9d013ae6d0 (diff) | |
| download | git-8c11b25de41857e5a44325046dd55d3751f740c6.tar.gz git-8c11b25de41857e5a44325046dd55d3751f740c6.tar.xz | |
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/branch.c')
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 5cb6d78f2..ffd26849c 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -197,7 +197,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, free(name); - name = xstrdup(mkpath(fmt, bname.buf)); + name = mkpathdup(fmt, bname.buf); if (read_ref(name, sha1)) { error(remote_branch ? _("remote branch '%s' not found.") |