diff options
| author | H. Merijn Brand <h.m.brand@xs4all.nl> | 2013-04-29 10:09:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-29 10:10:26 +0200 |
| commit | eafc2dd59f4d28d4a01deb24df588fd7a29990d8 (patch) | |
| tree | ecda83c15efc2a799345e9b4298093e68d7fcd21 /Documentation/git-merge.txt | |
| parent | Git 1.8.0.3 (diff) | |
| download | git-eafc2dd59f4d28d4a01deb24df588fd7a29990d8.tar.xz git-eafc2dd59f4d28d4a01deb24df588fd7a29990d8.zip | |
Git.pm: call tempfile from File::Temp as a regular function
We call File::Temp's "tempfile" function as a class method, but it was
never designed to be called this way. Older versions seemed to
tolerate it, but as of File::Temp 0.23, it blows up like this:
$ git svn fetch
'tempfile' can't be called as a method at .../Git.pm line 1117.
Fix it by calling it as a regular function, just inside the File::Temp
namespace.
Signed-off-by: H. Merijn Brand <h.m.brand@xs4all.nl>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions