OSDN Git Service
René Scharfe [Tue, 16 Oct 2012 10:22:15 +0000 (12:22 +0200)]
refs: lock symref that is to be deleted, not its target
When delete_ref is called on a symref then it locks its target and then
either deletes the target or the symref, depending on whether the flag
REF_NODEREF was set in the parameter delopt.
Instead, simply pass the flag to lock_ref_sha1_basic, which will then
either lock the target or the symref, and delete the locked ref.
This reimplements part of
eca35a25 (Fix git branch -m for symrefs.).
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sun, 17 Jun 2012 21:07:15 +0000 (14:07 -0700)]
Git 1.7.11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sun, 17 Jun 2012 21:05:53 +0000 (14:05 -0700)]
Sync with 1.7.10.5
Junio C Hamano [Sun, 17 Jun 2012 21:04:15 +0000 (14:04 -0700)]
Git 1.7.10.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vincent van Ravesteijn [Thu, 24 May 2012 13:57:26 +0000 (13:57 +0000)]
Do not autosquash in case of an implied interactive rebase
The option to autosquash is only used in case of an interactive rebase.
When merges are preserved, rebase uses an interactive rebase internally,
but in this case autosquash should still be disabled.
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sun, 17 Jun 2012 21:00:03 +0000 (14:00 -0700)]
Merge branch 'js/maint-fast-export-mark-error' into maint
"git fast-export" did not give a readable error message when the same
mark erroneously appeared twice in the --import-marks input.
Junio C Hamano [Fri, 15 Jun 2012 22:01:16 +0000 (15:01 -0700)]
Merge git://github.com/git-l10n/git-po
Updated Italian translations.
* git://github.com/git-l10n/git-po:
l10n: it.po: translate 212 new messages
Junio C Hamano [Fri, 15 Jun 2012 22:00:53 +0000 (15:00 -0700)]
Merge branch 'as/diff-shortstat-ignore-binary'
# By Alexander Strasser
* as/diff-shortstat-ignore-binary:
diff: Only count lines in show_shortstats
Alexander Strasser [Fri, 15 Jun 2012 21:50:30 +0000 (23:50 +0200)]
diff: Only count lines in show_shortstats
Do not mix byte and line counts. Binary files have byte counts;
skip them when accumulating line insertions/deletions.
The regression was introduced in
e18872b.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder [Fri, 15 Jun 2012 18:05:05 +0000 (13:05 -0500)]
perl/Makefile: install Git::SVN::* when NO_PERL_MAKEMAKER=yes, too
v1.7.11-rc1~12^2~2 (2012-05-27) and friends split some git-svn code
into separate modules but did not update the fallback rules to install
them when NO_PERL_MAKEMAKER is set. Add the appropriate rules so
users without MakeMaker can use git-svn again.
Affected modules: Git::SVN::Prompt, Git::SVN::Fetcher,
Git::SVN::Editor, Git::SVN::Ra, Git::SVN::Memoize::YAML.
Reported-by: Adam Roben <adam@roben.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmali.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder [Fri, 15 Jun 2012 18:14:46 +0000 (13:14 -0500)]
perl/Makefile.PL: warn about duplicate module list in perl/Makefile
Adding or removing a module requires modifying both files to support
builds with and without MakeMaker. Add a comment to remind patch
authors and reviewers at the crucial moment.
Longer term, it would be nicer to maintain a single list, perhaps in a
separate file used by both build systems.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Marco Paolone [Thu, 14 Jun 2012 12:14:31 +0000 (14:14 +0200)]
l10n: it.po: translate 212 new messages
Signed-off-by: Marco Paolone <marcopaolone@gmail.com>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Junio C Hamano [Wed, 13 Jun 2012 18:48:54 +0000 (11:48 -0700)]
Merge branch 'rj/gitweb-test-sans-date-parser'
Regression fix to t9501 introduced at
0f3ddd4
* rj/gitweb-test-sans-date-parser:
gitweb: Skip 'modification times' tests when no date parser available
Junio C Hamano [Wed, 13 Jun 2012 18:47:11 +0000 (11:47 -0700)]
Merge branch 'fc/git-complete-helper-fix'
* fc/git-complete-helper-fix:
completion: put main git and gitk completion functions back into git namespace
SZEDER Gábor [Wed, 13 Jun 2012 08:11:29 +0000 (10:11 +0200)]
completion: remove credential helpers from porcelain commands
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor [Wed, 13 Jun 2012 08:08:50 +0000 (10:08 +0200)]
completion: put main git and gitk completion functions back into git namespace
Commit
7f02f3d7 (completion: rename internal helpers _git and _gitk,
2012-05-19) renamed said functions to _main_git() and _main_gitk(),
respectively. By convention the name of our git-completion-specific
functions start with '_git' or '__git' prefix, so rename those
functions once again to put them back into our "namespace". Use the
two underscore prefix, because _git_main() could be mistaken for the
completion function of the (not yet existing) 'git main' command.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones [Tue, 12 Jun 2012 18:09:38 +0000 (19:09 +0100)]
gitweb: Skip 'modification times' tests when no date parser available
The If-Modified-Since support in Gitweb is conditional on the
availability of a date parser from either the HTTP::Date or
Time::ParseDate modules. If a suitable parser is not available,
then the corresponding 'modification times' tests should be skipped.
Introduce the DATE_PARSER test prerequisite and use it to skip
all of the dependent tests.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 12 Jun 2012 16:10:52 +0000 (09:10 -0700)]
Git 1.7.11-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 12 Jun 2012 16:08:35 +0000 (09:08 -0700)]
Merge git://github.com/git-l10n/git-po
Updates to German, Vietnamese and simplified Chinese translation.
* git://github.com/git-l10n/git-po:
l10n: de.po: translate 27 new messages
l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb
l10n: zh_CN.po: translate 27 new messages
l10n: Update git.pot (27 new, 1 removed messages)
Jiang Xin [Tue, 12 Jun 2012 15:41:05 +0000 (23:41 +0800)]
Merge git://github.com/ralfth/git-po-de
By Ralf Thielow
via Ralf Thielow
* github.com/ralfth/git-po-de:
l10n: de.po: translate 27 new messages
Junio C Hamano [Tue, 12 Jun 2012 15:40:16 +0000 (08:40 -0700)]
Merge branch 'mm/api-credentials-doc'
* mm/api-credentials-doc:
api-credential.txt: document that helpers field is filled-in automatically
Junio C Hamano [Tue, 12 Jun 2012 15:33:30 +0000 (08:33 -0700)]
Merge branch 'jc/fmt-merge-msg-people'
Tone down the lines that credit people involved and make them
comments, so that integrators who edit their merge messages can
still make use of the information, but lazy ones will not leave
the unverified guesses placed on the "via" line.
* jc/fmt-merge-msg-people:
fmt-merge-msg: make attribution into comment lines
Matthieu Moy [Mon, 11 Jun 2012 17:51:47 +0000 (19:51 +0200)]
api-credential.txt: document that helpers field is filled-in automatically
It was unclear whether the field was to be specified by the user of the
API.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 12 Jun 2012 14:27:50 +0000 (07:27 -0700)]
Merge branch 'js/maint-fast-export-mark-error'
* js/maint-fast-export-mark-error:
fast-export: report SHA-1 instead of gibberish when marks exist already
Johannes Schindelin [Tue, 12 Jun 2012 13:45:16 +0000 (15:45 +0200)]
fast-export: report SHA-1 instead of gibberish when marks exist already
Cc: Pieter de Bie <pdebie@ai.rug.nl>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Max Horn <max@quendi.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Thielow [Fri, 8 Jun 2012 17:15:10 +0000 (19:15 +0200)]
l10n: de.po: translate 27 new messages
Translate 27 new messages came from git.pot update
in
7256fd7 (l10n: Update git.pot (27 new, 1 removed messages)).
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Jonathan Nieder [Sat, 9 Jun 2012 22:35:35 +0000 (17:35 -0500)]
git-svn: use YAML format for mergeinfo cache when possible
Since v1.7.0-rc2~11 (git-svn: persistent memoization, 2010-01-30),
git-svn has maintained some private per-repository caches in
.git/svn/.caches to avoid refetching and recalculating some
mergeinfo-related information with every "git svn fetch".
These caches use the 'nstore' format from the perl core module
Storable, which can be read and written quickly and was designed for
transfer over the wire (the 'n' stands for 'network'). This format is
endianness-independent and independent of floating-point
representation.
Unfortunately the format is *not* independent of the perl version ---
new perl versions will write files that very old perl cannot read.
Worse, the format is not independent of the size of a perl integer.
So if you toggle perl's use64bitint compile-time option, then using
'git svn fetch' on your old repositories produces errors like this:
Byte order is not compatible at ../../lib/Storable.pm (autosplit
into ../../lib/auto/Storable/_retrieve.al) line 380, at
/usr/share/perl/5.12/Memoize/Storable.pm line 21
That is, upgrading perl to a version that uses use64bitint for the
first time makes git-svn suddenly refuse to fetch in existing
repositories. Removing .git/svn/.caches lets git-svn recover.
It's time to switch to a platform independent serializer backend with
better compatibility guarantees. This patch uses YAML::Any.
Other choices were considered:
- thawing data from Data::Dumper involves "eval". Doing that without
creating a security risk is fussy.
- the JSON API works on scalars in memory and doesn't provide a
standard way to serialize straight to disk.
YAML::Any is reasonably fast and has a pleasant API. In most
backends, LoadFile() reads the entire file into a scalar anyway and
converts it as a second step, but having an interface that allows the
deserialization to happen on the fly without a temporary is still a
comfort.
YAML::Any is not a core perl module, so we take care to use it when
and only when it is available. Installations without that module
should fall back to using Storable with all its quirks, keeping their
cache files in
.git/svn/.caches/*.db
Installations with YAML peacefully coexist by keeping a separate set
of cache files in
.git/svn/.caches/*.yaml.
In most cases, switching between is a one-time thing, so it doesn't
seem worth the complication to migrate existing caches.
The upshot: after this patch, as long as YAML::Any is installed you
can move your git repository between machines with different perl
installations and "git svn fetch" will work fine. If you do not have
YAML::Any, the behavior is unchanged (and in particular does not get
any worse).
Reported-by: Sandro Weiser <sandro.weiser@informatik.tu-chemnitz.de>
Reported-by: Bdale Garbee <bdale@gag.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Jonathan Nieder [Sat, 9 Jun 2012 22:28:10 +0000 (17:28 -0500)]
git-svn: make Git::SVN::RA a separate file
This slices off another 600 or so lines from the frighteningly long
git-svn.perl script.
The Git::SVN::Ra interface is similar enough to SVN::Ra that it is
probably safe to ignore most of its implementation on first reading.
(Documenting or moving functions that do not fit that pattern is left
as an exercise to the interested reader.)
[ew: rebased and fixed conflict against
commit
c26ddce86d7215b4d9687bd4c6b5dd43a3fabf31
(git-svn: platform auth providers are working only on 1.6.15 or newer)]
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Jonathan Nieder [Sat, 9 Jun 2012 22:25:56 +0000 (17:25 -0500)]
git-svn: make Git::SVN::Editor a separate file
This makes the git-svn script shorter and less scary for beginners to
read through for the first time. Take the opportunity to explain the
purpose and basic interface of the Git::SVN::Editor class while at it.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Tran Ngoc Quan [Sat, 9 Jun 2012 07:14:03 +0000 (14:14 +0700)]
l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb
* Translated 28 strings.
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Junio C Hamano [Fri, 8 Jun 2012 15:32:19 +0000 (08:32 -0700)]
Merge branch 'mm/api-credentials-doc'
Finishing touches...
* mm/api-credentials-doc:
docs: fix cross-directory linkgit references
Jeff King [Thu, 7 Jun 2012 21:03:23 +0000 (23:03 +0200)]
docs: fix cross-directory linkgit references
Most of our documentation is in a single directory, so using
linkgit:git-config[1] just generates a relative link in the
same directory. However, this is not the case with the API
documentation in technical/*, which need to refer to
git-config from the parent directory.
We can fix this by passing a special prefix attribute when building
in a subdirectory, and respecting that prefix in our linkgit
definitions.
We only have to modify the html linkgit definition. For
manpages, we can ignore this for two reasons:
1. we do not generate actual links to the file in
manpages, but instead just give the name and section of
the linked manpage
2. we do not currently build manpages for subdirectories,
only html
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin [Fri, 8 Jun 2012 04:07:25 +0000 (12:07 +0800)]
l10n: zh_CN.po: translate 27 new messages
Translate 19 new and 8 fuzzy messages which are marked by shell gettext
wrappers, and ignored by previous 'git.pot' updates.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin [Fri, 8 Jun 2012 02:40:20 +0000 (10:40 +0800)]
l10n: Update git.pot (27 new, 1 removed messages)
Extract messages marked by shell gettext wrappers which are ignored
before. See:
* http://thread.gmane.org/gmane.comp.version-control.git/199112
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Junio C Hamano [Thu, 7 Jun 2012 16:14:41 +0000 (09:14 -0700)]
Git 1.7.11-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 7 Jun 2012 16:07:35 +0000 (09:07 -0700)]
Merge branch 'mm/api-credentials-doc'
* mm/api-credentials-doc:
api-credentials.txt: add "see also" section
api-credentials.txt: mention credential.helper explicitly
api-credentials.txt: show the big picture first
doc: fix xref link from api docs to manual pages
Junio C Hamano [Thu, 7 Jun 2012 16:07:27 +0000 (09:07 -0700)]
Merge branch 'rr/maint-t3510-cascade-fix'
* rr/maint-t3510-cascade-fix:
t3510 (cherry-pick-sequence): add missing '&&'
Junio C Hamano [Thu, 7 Jun 2012 16:07:08 +0000 (09:07 -0700)]
Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'
Regression fix for people with libsvn between 1.6.12 and 1.6.15, on
which we tried to use the non-working platform auth providers.
* jc/svn-auth-providers-unusable-at-1.6.12:
git-svn: platform auth providers are working only on 1.6.15 or newer
Junio C Hamano [Thu, 7 Jun 2012 16:06:39 +0000 (09:06 -0700)]
Merge branch 'cr/persistent-https'
A remote helper that acts as a proxy and caches ssl session for the
https:// transport is added to the contrib/ area.
By Colby Ranger
* cr/persistent-https:
Add persistent-https to contrib
Junio C Hamano [Wed, 6 Jun 2012 21:24:28 +0000 (14:24 -0700)]
fmt-merge-msg: make attribution into comment lines
The submaintainer credit is not something you can compute purely by
looking at the history and its shape, especially in the presense of
fast-forward merges, and this observation makes the information on
the "via" line unreliable. Let's leave the final determination of
credits up to whoever is making the merge and show them as comments.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 5 Jun 2012 17:57:53 +0000 (10:57 -0700)]
Merge git://github.com/git-l10n/git-po
German and Chinese translation updates.
By Ralf Thielow (4) and others
via Jiang Xin (1) and Tran Ngoc Quan (1)
* git://github.com/git-l10n/git-po:
l10n: Update translation for Vietnamese
l10n: de.po: add additional newline
l10n: de.po: translate 2 new, 3 fuzzy messages
l10n: de.po: translate 41 new messages
l10n: de.po: translate 265 new messages
l10n: zh_CN.po: translate 2 new, 3 fuzzy messages
l10n: Update git.pot (5 new, 3 removed messages)
Ramkumar Ramachandra [Mon, 4 Jun 2012 16:42:44 +0000 (22:12 +0530)]
t3510 (cherry-pick-sequence): add missing '&&'
Breaks in a test assertion's && chain can potentially hide failures
from earlier commands in the chain. Fix an instance of this in the
setup.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy [Mon, 4 Jun 2012 20:17:44 +0000 (22:17 +0200)]
api-credentials.txt: add "see also" section
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy [Mon, 4 Jun 2012 20:17:43 +0000 (22:17 +0200)]
api-credentials.txt: mention credential.helper explicitly
The name of the configuration variable was mentioned only at the very
end of the explanation, in a place specific to a specific rule, hence it
was not very clear what the specification was about.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy [Mon, 4 Jun 2012 20:17:42 +0000 (22:17 +0200)]
api-credentials.txt: show the big picture first
The API documentation targets two kinds of developers: those using the
C API, and those writing remote-helpers. The document was not clear
about which part was useful to which category, and for example, the C API
could be mistakenly thought as an API for writting remote helpers.
Based-on-patch-by: Jeff King <peff@peff.net>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 4 Jun 2012 19:30:04 +0000 (12:30 -0700)]
doc: fix xref link from api docs to manual pages
They are one-level above, so refer them as linkgit:../git-foo[n] with "../"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 4 Jun 2012 19:20:59 +0000 (12:20 -0700)]
git-svn: platform auth providers are working only on 1.6.15 or newer
Matthijs Kooijman reports that the cut-off point
082afee (git-svn:
use platform specific auth providers, 2012-04-26) set at 1.6.12 to
use this feature safely was incorrect, and it is 1.6.15 instead:
http://svn.apache.org/repos/asf/subversion/trunk/CHANGES
Version 1.6.15
* improve some swig parameter mapping (r984565, r1035745)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Jiang Xin [Mon, 4 Jun 2012 15:45:13 +0000 (23:45 +0800)]
Merge git://github.com/ralfth/git-po-de
By Ralf Thielow
via Ralf Thielow
* ralfth/git-po-de/master:
l10n: de.po: add additional newline
l10n: de.po: translate 2 new, 3 fuzzy messages
l10n: de.po: translate 41 new messages
l10n: de.po: translate 265 new messages
Tran Ngoc Quan [Sat, 2 Jun 2012 00:37:40 +0000 (07:37 +0700)]
l10n: Update translation for Vietnamese
* Updated 5 strings for v1.7.11-rc0-100-g5498c
* Retranslated about 16 strings
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Junio C Hamano [Sun, 3 Jun 2012 22:56:05 +0000 (15:56 -0700)]
Git 1.7.11-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sun, 3 Jun 2012 22:54:33 +0000 (15:54 -0700)]
Sync with 1.7.10.4
* maint:
Git 1.7.10.4
Junio C Hamano [Sun, 3 Jun 2012 22:53:58 +0000 (15:53 -0700)]
Git 1.7.10.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sun, 3 Jun 2012 22:52:18 +0000 (15:52 -0700)]
Merge branch 'ef/maint-rebase-error-message' into maint
When "git rebase" was given a bad commit to replay the history on,
its error message did not correctly give the command line argument
it had trouble parsing.
By Erik Faye-Lund
* ef/maint-rebase-error-message:
rebase: report invalid commit correctly
Ralf Thielow [Sat, 2 Jun 2012 18:10:31 +0000 (20:10 +0200)]
l10n: de.po: add additional newline
The translation of "builtin/gc.c:224" was missing of
a newline which made the second part of the message
quite long. We simply add a newline.
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Ralf Thielow [Sat, 2 Jun 2012 15:03:29 +0000 (17:03 +0200)]
l10n: de.po: translate 2 new, 3 fuzzy messages
Translate 2 new and 3 fuzzy messages came from git.pot update
in
75f7b4b (l10n: Update git.pot (5 new, 3 removed messages)).
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Ralf Thielow [Wed, 23 May 2012 16:53:40 +0000 (18:53 +0200)]
l10n: de.po: translate 41 new messages
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Ralf Thielow [Fri, 18 May 2012 16:29:52 +0000 (18:29 +0200)]
l10n: de.po: translate 265 new messages
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Jiang Xin [Sat, 2 Jun 2012 09:12:59 +0000 (17:12 +0800)]
l10n: zh_CN.po: translate 2 new, 3 fuzzy messages
Translate 2 new and 3 fuzzy messages came from git.pot update
in
75f7b4b (l10n: Update git.pot (5 new, 3 removed messages)).
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin [Fri, 1 Jun 2012 23:07:27 +0000 (07:07 +0800)]
l10n: Update git.pot (5 new, 3 removed messages)
Generate po/git.pot from v1.7.11-rc0-100-g5498c:
* 5 new l10n messages at lines:
635, 639, 1203, 1208, 3946
* 3 removed l10n messages at lines:
1194, 3158, 3936
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Junio C Hamano [Fri, 1 Jun 2012 20:29:48 +0000 (13:29 -0700)]
Update draft release notes to 1.7.11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 1 Jun 2012 20:28:25 +0000 (13:28 -0700)]
Merge branch 'ef/maint-rebase-error-message'
By Erik Faye-Lund
* ef/maint-rebase-error-message:
rebase: report invalid commit correctly
Junio C Hamano [Fri, 1 Jun 2012 20:28:19 +0000 (13:28 -0700)]
Merge branch 'nh/empty-rebase'
* nh/empty-rebase:
cherry-pick: regression fix for empty commits
Junio C Hamano [Fri, 1 Jun 2012 20:28:01 +0000 (13:28 -0700)]
Merge branch 'vr/rebase-autosquash-does-not-imply-i'
"git rebase -p" used to pay attention to rebase.autosquash which was
wrong. "git rebase -p -i" should, but "git rebase -p" by itself
should not.
By Vincent van Ravesteijn
* vr/rebase-autosquash-does-not-imply-i:
Do not autosquash in case of an implied interactive rebase
Junio C Hamano [Fri, 1 Jun 2012 20:27:48 +0000 (13:27 -0700)]
Merge branch 'mm/levenstein-penalize-deletion-less'
"git tags" used to suggest "git stage" which was nonsense; it should
have favored "git tag". Tweak the cost of deletion to correct it.
By Matthieu Moy
* mm/levenstein-penalize-deletion-less:
Reduce cost of deletion in levenstein distance (4 -> 3)
Junio C Hamano [Fri, 1 Jun 2012 20:26:46 +0000 (13:26 -0700)]
Merge branch 'jl/submodule-report-new-path-once'
"git submodule init" used to report "registered for path ..." even
for submodules that were registered earlier.
By Jens Lehmann
* jl/submodule-report-new-path-once:
submodules: print "registered for path" message only once
Junio C Hamano [Fri, 1 Jun 2012 20:26:16 +0000 (13:26 -0700)]
Sync with maint
Junio C Hamano [Fri, 1 Jun 2012 20:05:27 +0000 (13:05 -0700)]
Start preparing for 1.7.10.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 1 Jun 2012 20:22:44 +0000 (13:22 -0700)]
Merge branch 'ef/http-o-depends-on-gvf' into maint
A minor compilation fix.
By Erik Faye-Lund
* ef/http-o-depends-on-gvf:
Makefile: add missing GIT-VERSION-FILE dependency
Junio C Hamano [Fri, 1 Jun 2012 20:21:37 +0000 (13:21 -0700)]
Merge git://github.com/git-l10n/git-po
By Jiang Xin (4) and others
via Jiang Xin
* git://github.com/git-l10n/git-po:
l10n: Set nplurals of zh_CN.po from 1 to 2
l10n: zh_CN.po: translate 323 new messages
l10n: zh.CN.po: update by msgmerge git.pot
First release translation for Vietnamese
Init translation for Vietnamese
l10n: New it.po file with 504 translations
Update Swedish translation (728t0f0u)
l10n: Update git.pot (41 new messages)
Junio C Hamano [Fri, 1 Jun 2012 20:01:41 +0000 (13:01 -0700)]
Merge branch 'rs/maint-grep-F' into maint
"git grep -e '$pattern'", unlike the case where the patterns are read from
a file, did not treat individual lines in the given pattern argument as
separate regular expressions as it should.
By René Scharfe
* rs/maint-grep-F:
grep: stop leaking line strings with -f
grep: support newline separated pattern list
grep: factor out do_append_grep_pat()
grep: factor out create_grep_pat()
Junio C Hamano [Fri, 1 Jun 2012 20:01:36 +0000 (13:01 -0700)]
Merge branch 'jk/ident-split-fix' into maint
An author/committer name that is a single character was mishandled as an
invalid name by mistake.
By Jeff King
* jk/ident-split-fix:
fix off-by-one error in split_ident_line
Junio C Hamano [Fri, 1 Jun 2012 20:01:33 +0000 (13:01 -0700)]
Merge branch 'jk/pretty-commit-header-incomplete-line' into maint
By Jeff King
* jk/pretty-commit-header-incomplete-line:
avoid segfault when reading header of malformed commits
Junio C Hamano [Fri, 1 Jun 2012 19:59:58 +0000 (12:59 -0700)]
Merge branch 'jk/format-person-part-buffer-limit' into maint
By Jeff King
* jk/format-person-part-buffer-limit:
pretty: avoid buffer overflow in format_person_part
Junio C Hamano [Fri, 1 Jun 2012 19:59:50 +0000 (12:59 -0700)]
Merge branch 'ap/checkout-no-progress-for-non-tty' into maint
"git checkout" gave progress display even when the standard error
stream was not connected to the tty, which made little sense.
By Avery Pennarun
* ap/checkout-no-progress-for-non-tty:
checkout: no progress messages if !isatty(2).
Junio C Hamano [Fri, 1 Jun 2012 19:50:41 +0000 (12:50 -0700)]
Merge branch 'maint' of git://github.com/git-l10n/git-po into maint
By Peter Krefting
via Peter Krefting
* 'maint' of git://github.com/git-l10n/git-po:
Update Swedish translation (728t0f0u)
Jiang Xin [Thu, 31 May 2012 11:20:42 +0000 (19:20 +0800)]
i18n: apply: split to fix a partial i18n message
The 4th arg of "new mode (%o) of %s does not match old mode (%o)%s%s"
is blank string or string " of ". Even mark the string " of " for a
complete i18n, this message is still hard to translate right.
Split it into two slight different messages would make l10n teams happy.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin [Thu, 31 May 2012 09:35:59 +0000 (17:35 +0800)]
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin [Wed, 30 May 2012 04:19:47 +0000 (12:19 +0800)]
l10n: zh_CN.po: translate 323 new messages
Update Simplified Chinese translation for 134 fuzzy, 189 new messages
from Git v1.7.10.2-548-g9de96.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Zhuang Ya <zhuangya@me.com>
Erik Faye-Lund [Thu, 31 May 2012 14:10:44 +0000 (16:10 +0200)]
Makefile: add missing GIT-VERSION-FILE dependency
In
20fc9bc (Set HTTP user agent to git/GIT_VERSION, 2006-04-04),
http.o started recording GIT_VERSION, but http.o wasn't added
to the list of files that depends on GIT-VERSION-FILE.
Fix this, so mofications to GIT-VERSION-FILE will result in an
updated user-agent string.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin [Mon, 21 May 2012 01:35:47 +0000 (09:35 +0800)]
l10n: zh.CN.po: update by msgmerge git.pot
Update of zh_CN.po: 134 fuzzy translations, 189 untranslated messages.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Tran Ngoc Quan [Thu, 31 May 2012 02:16:38 +0000 (09:16 +0700)]
First release translation for Vietnamese
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Tran Ngoc Quan [Sun, 6 May 2012 02:42:49 +0000 (09:42 +0700)]
Init translation for Vietnamese
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Colby Ranger [Tue, 29 May 2012 21:52:00 +0000 (14:52 -0700)]
Add persistent-https to contrib
Git over HTTPS has a high request startup latency, since the SSL
negotiation can take up to a second. In order to reduce this latency,
connections should be left open to the Git server across requests
(or invocations of the git commandline).
Reduce SSL startup latency by running a daemon job that keeps
connections open to a Git server. The daemon job
(git-remote-persistent-https--proxy) is started on the first request
through the client binary (git-remote-persistent-https) and remains
running for 24 hours after the last request, or until a new daemon
binary is placed in the PATH. The client determines the daemon's
HTTP address by communicating over a UNIX socket with the daemon.
From there, the rest of the Git protocol work is delegated to the
"git-remote-http" binary, with the environment's http_proxy set to
the daemon.
Accessing /pub/scm/linux/kernel/git/torvalds/linux repository hosted
at kernel.googlesource.com with "git ls-remote" over https:// and
persistent-https:// 5 times shows that the first request takes about
the same time (0.193s vs 0.208s---there is a slight set-up cost for
the local proxy); as expected, the other four requests are much
faster (~0.18s vs ~0.08s).
Incidentally, this also has the benefit of HTTP keep-alive working
across Git command invocations. Its common for servers to use a 5
minute keep-alive on an HTTP 1.1 connection. Git-over-HTTP commonly
uses Transfer-Encoding: chunked on replies, so keep-alive will
generally just work, even though a pack stream's length isn't known
in advance. Because the helper is an external process holding that
connection open, we also benefit from being able to reuse an
existing TCP connection to the server. The same "git ls-remote"
test against http:// vs persistent-https:// URL shows that the
former takes ~0.09s while the first request for the latter is about
0.134s with set-up cost, and subsequent requests are ~0.065s,
shaving around one RTT to the server.
Signed-off-by: Colby Ranger <cranger@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Erik Faye-Lund [Wed, 30 May 2012 16:39:42 +0000 (18:39 +0200)]
rebase: report invalid commit correctly
In
9765b6a (rebase: align variable content, 2011-02-06), the code
to error out was moved up one level. Unfortunately, one reference
to a function parameter wasn't rewritten as it should, leading to
the wrong parameter being errored on.
This error was propagated by
71786f5 (rebase: factor out reference
parsing, 2011-02-06) and merged in
78c6e0f (Merge branch
'mz/rebase', 2011-04-28).
Correct this by reporting $onto_name istead.
Reported-By: Manuela Hutter <manuelah@opera.com>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Wed, 30 May 2012 10:18:29 +0000 (06:18 -0400)]
INSTALL: update asciidoc recommendation
Since commit
6cf378f (docs: stop using asciidoc no-inline-literal),
we no longer support asciidoc versions less than 8.4.1,
which introduced inline literals. Note this in the INSTALL
document.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Marco Paolone [Tue, 29 May 2012 21:03:51 +0000 (23:03 +0200)]
l10n: New it.po file with 504 translations
Signed-off-by: Marco Paolone <marcopaolone@gmail.com>
Junio C Hamano [Wed, 30 May 2012 00:14:41 +0000 (17:14 -0700)]
cherry-pick: regression fix for empty commits
The earlier "--keep-redundant-commit" series broke "cherry-pick"
that is given a commit whose change is already in the current
history. Such a cherry-pick would result in an empty change, and
should stop with an error, telling the user that conflict resolution
may have made the result empty (which is exactly what is happening),
but we silently dropped the change on the floor without any message
nor non-zero exit code.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Mon, 28 May 2012 19:46:58 +0000 (21:46 +0200)]
submodules: print "registered for path" message only once
Since
2cd9de3e (submodule add: always initialize .git/config entry) the
message "Submodule '\$name' (\$url) registered for path '\$sm_path'" is
printed every time cmd_init() is called, e.g. each time "git submodule
update" is used with the --init option.
This was not intended and leads to bogus output which can confuse users
and build systems. Apart from that the $url variable was not set after the
first run which did the actual initialization and only "()" was printed
in subsequent runs where "($url)" was meant to inform the user about the
upstream repo.
Fix that by moving the say command in question into the if block where the
url is initialized, restoring the behavior that was in place before the
2cd9de3e commit. While at it also remove the comment which still describes
the logic used before
2cd9de3e and add a comment about how things work now.
Reported-by: Nicolas Viennot and Sid Nair <nicolas@viennot.com>
Reported-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 29 May 2012 20:47:55 +0000 (13:47 -0700)]
Merge git://bogomips.org/git-svn
By Jonathan Nieder
via Eric Wong
* git://bogomips.org/git-svn:
git-svn: make Git::SVN::Fetcher a separate file
git-svn: rename SVN::Git::* packages to Git::SVN::*
git-svn: move Git::SVN::Prompt into its own file
Jeff King [Sat, 26 May 2012 03:42:53 +0000 (23:42 -0400)]
t5701: modernize style
This test is pretty old and did not follow some of our more
modern best practices. In particular:
1. It chdir'd all over the place, leaving later tests to
deal with the fallout. Do our chdirs in subshells
instead.
2. It did not use test_must_fail.
3. It did not use test_line_count.
4. It checked for the non-existence of a ref by looking in the
.git/refs directory (since we pack refs during clone
these days, this will always be succeed, making the
test useless).
Note that one call to "-e .git/refs/..." remains,
because it is checking for the existence of a symbolic
ref, not a ref itself.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 29 May 2012 20:09:20 +0000 (13:09 -0700)]
Merge branch 'va/git-p4-test'
By Vitor Antunes
* va/git-p4-test:
git-p4: Clean up branch test cases
git-p4: Verify detection of "empty" branch creation
git-p4: Test changelists touching two branches
Junio C Hamano [Tue, 29 May 2012 20:09:13 +0000 (13:09 -0700)]
Merge branch 'jk/ident-gecos-strbuf'
Fixes quite a lot of brokenness when ident information needs to be taken
from the system and cleans up the code.
By Jeff King
* jk/ident-gecos-strbuf: (22 commits)
format-patch: do not use bogus email addresses in message ids
ident: reject bogus email addresses with IDENT_STRICT
ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT
format-patch: use GIT_COMMITTER_EMAIL in message ids
ident: let callers omit name with fmt_indent
ident: refactor NO_DATE flag in fmt_ident
ident: reword empty ident error message
format-patch: refactor get_patch_filename
ident: trim whitespace from default name/email
ident: use a dynamic strbuf in fmt_ident
ident: use full dns names to generate email addresses
ident: report passwd errors with a more friendly message
drop length limitations on gecos-derived names and emails
ident: don't write fallback username into git_default_name
fmt_ident: drop IDENT_WARN_ON_NO_NAME code
format-patch: use default email for generating message ids
ident: trim trailing newline from /etc/mailname
move git_default_* variables to ident.c
move identity config parsing to ident.c
fmt-merge-msg: don't use static buffer in record_person
...
Junio C Hamano [Tue, 29 May 2012 20:09:08 +0000 (13:09 -0700)]
Merge branch 'jk/fetch-pack-remove-dups-optim'
The way "fetch-pack" that is given multiple references to fetch tried to
remove duplicates was very inefficient.
By Jeff King
* jk/fetch-pack-remove-dups-optim:
fetch-pack: sort incoming heads list earlier
fetch-pack: avoid quadratic loop in filter_refs
fetch-pack: sort the list of incoming refs
add sorting infrastructure for list refs
fetch-pack: avoid quadratic behavior in remove_duplicates
fetch-pack: sort incoming heads
Junio C Hamano [Tue, 29 May 2012 20:09:02 +0000 (13:09 -0700)]
Merge branch 'rs/refs-string-slice'
Avoid unnecessary temporary allocations while looking for matching refs
inside refs API.
By René Scharfe (3) and Junio C Hamano (1)
* rs/refs-string-slice:
refs: do not create ref_entry when searching
refs: use strings directly in find_containing_dir()
refs: convert parameter of create_dir_entry() to length-limited string
refs: convert parameter of search_ref_dir() to length-limited string
Junio C Hamano [Tue, 29 May 2012 20:08:53 +0000 (13:08 -0700)]
Merge branch 'mh/fetch-pack-constness'
Tighten constness of some local variables in a callchain.
By Michael Haggerty
* mh/fetch-pack-constness:
cmd_fetch_pack(): respect constness of argv parameter
cmd_fetch_pack(): combine the loop termination conditions
cmd_fetch_pack(): handle non-option arguments outside of the loop
cmd_fetch_pack(): declare dest to be const
Junio C Hamano [Tue, 29 May 2012 20:08:35 +0000 (13:08 -0700)]
Merge branch 'mh/ref-api-lazy-loose'
The code to lazily read loose refs unnecessarily read the refs in a
subhierarchy by mistake when we free the data for the subhierarchy.
By Michael Haggerty
* mh/ref-api-lazy-loose:
free_ref_entry(): do not trigger reading of loose refs
Junio C Hamano [Tue, 29 May 2012 20:08:30 +0000 (13:08 -0700)]
Merge branch 'ng/pack-objects-cleanup'
By Nguyễn Thái Ngọc Duy
* ng/pack-objects-cleanup:
pack-objects: refactor write_object() into helper functions
pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."
Vincent van Ravesteijn [Thu, 24 May 2012 13:57:26 +0000 (13:57 +0000)]
Do not autosquash in case of an implied interactive rebase
The option to autosquash is only used in case of an interactive rebase.
When merges are preserved, rebase uses an interactive rebase internally,
but in this case autosquash should still be disabled.
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy [Sun, 27 May 2012 16:02:58 +0000 (18:02 +0200)]
Reduce cost of deletion in levenstein distance (4 -> 3)
Before this patch, a character deletion has the same cost as 2 swaps, or
4 additions, so Git prefers suggesting a completely scrambled command
name to removing a character. For example, "git tags" suggests "stage",
but not "tag".
By setting the deletion cost to 3, we keep it higher than swaps or
additions, but prefer 1 deletion to 2 swaps. "git tags" now suggests
"tag" in addition to staged.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vitor Antunes [Sat, 26 May 2012 09:56:06 +0000 (10:56 +0100)]
git-p4: Clean up branch test cases
Correct submit description in one test and remove not required commands
from another.
Signed-off-by: Vitor Antunes <vitor.hda@gmail.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>