global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-25 17:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
  Update draft release notes to 1.7.10
  Git::I18N: compatibility with perl <5.8.3
This commit is contained in:
Junio C Hamano
2012-03-16 09:17:18 -07:00
parent cca0032834 f524129737
commit 898d271183
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/RelNotes/1.7.10.txt
View File

@@ -180,6 +180,10 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
releases are contained in this release (see release notes to them for
details).
* "git fast-import" accepted "ls" command with an empty path by
mistake.
(merge 178e1de jn/maint-fast-import-empty-ls later to maint).
* The "remaining" subcommand to "git rerere" was not documented.
(merge 3e7a1df ph/rerere-doc later to maint).
@@ -192,13 +196,18 @@ details).
error was at the end of line.
(merge 4b34059 ms/maint-config-error-at-eol-linecount later to maint).
* "configure" script learned to take "--sane-tool-path" from the
command line to record SANE_TOOL_PATH (used to avoid broken
platform tools in /usr/bin) in config.mak-autogen. This may be useful
for people on Solaris who have saner tools outside /usr/xpg[46]/bin.
* "gitweb" used to drop warnings in the log file when "heads" view is
accessed in a repository whose HEAD does not point at a valid
branch.
---
exec >/var/tmp/1
O=v1.7.10-rc0-50-gd973dc0
O=v1.7.10-rc1-18-g0987145
echo O=$(git describe)
git log --first-parent --oneline ^maint $O..
echo

11
perl/Git/I18N.pm
View File

@@ -2,7 +2,16 @@ package Git::I18N;
use 5.008;
use strict;
use warnings;
use Exporter 'import';
BEGIN {
require Exporter;
if ($] < 5.008003) {
*import = \&Exporter::import;
} else {
# Exporter 5.57 which supports this invocation was
# released with perl 5.8.3
Exporter->import('import');
}
}
our @EXPORT = qw(__);
our @EXPORT_OK = @EXPORT;

7
perl/Makefile
View File

@@ -23,15 +23,18 @@ clean:
ifdef NO_PERL_MAKEMAKER
instdir_SQ = $(subst ','\'',$(prefix)/lib)
$(makfile): ../GIT-CFLAGS Makefile
echo all: private-Error.pm Git.pm > $@
echo ' mkdir -p blib/lib' >> $@
echo all: private-Error.pm Git.pm Git/I18N.pm > $@
echo ' mkdir -p blib/lib/Git' >> $@
echo ' $(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@
echo ' $(RM) blib/lib/Git/I18N.pm; cp Git/I18N.pm blib/lib/Git/' >> $@
echo ' $(RM) blib/lib/Error.pm' >> $@
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
echo install: >> $@
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git/I18N.pm"; cp Git/I18N.pm "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@