summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-07Git 1.7.11-rc2v1.7.11-rc2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-07Merge branch 'mm/api-credentials-doc'Junio C Hamano
* 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
2012-06-07Merge branch 'rr/maint-t3510-cascade-fix'Junio C Hamano
* rr/maint-t3510-cascade-fix: t3510 (cherry-pick-sequence): add missing '&&'
2012-06-07Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'Junio C Hamano
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
2012-06-07Merge branch 'cr/persistent-https'Junio C Hamano
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
2012-06-05Merge git://github.com/git-l10n/git-poJunio C Hamano
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)
2012-06-04t3510 (cherry-pick-sequence): add missing '&&'Ramkumar Ramachandra
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>
2012-06-04api-credentials.txt: add "see also" sectionMatthieu Moy
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-04api-credentials.txt: mention credential.helper explicitlyMatthieu Moy
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>
2012-06-04api-credentials.txt: show the big picture firstMatthieu Moy
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>
2012-06-04doc: fix xref link from api docs to manual pagesJunio C Hamano
They are one-level above, so refer them as linkgit:../git-foo[n] with "../" Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-04git-svn: platform auth providers are working only on 1.6.15 or newerJunio C Hamano
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>
2012-06-04Merge git://github.com/ralfth/git-po-deJiang Xin
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
2012-06-04l10n: Update translation for VietnameseTran Ngoc Quan
* Updated 5 strings for v1.7.11-rc0-100-g5498c * Retranslated about 16 strings Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2012-06-03Git 1.7.11-rc1v1.7.11-rc1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-03Sync with 1.7.10.4Junio C Hamano
* maint: Git 1.7.10.4
2012-06-03Git 1.7.10.4v1.7.10.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-03Merge branch 'ef/maint-rebase-error-message' into maintJunio C Hamano
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
2012-06-02l10n: de.po: add additional newlineRalf Thielow
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>
2012-06-02l10n: de.po: translate 2 new, 3 fuzzy messagesRalf Thielow
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>
2012-06-02l10n: de.po: translate 41 new messagesRalf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-06-02l10n: de.po: translate 265 new messagesRalf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-06-02l10n: zh_CN.po: translate 2 new, 3 fuzzy messagesJiang Xin
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>
2012-06-02l10n: Update git.pot (5 new, 3 removed messages)Jiang Xin
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>
2012-06-01Update draft release notes to 1.7.11Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-01Merge branch 'ef/maint-rebase-error-message'Junio C Hamano
By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly
2012-06-01Merge branch 'nh/empty-rebase'Junio C Hamano
* nh/empty-rebase: cherry-pick: regression fix for empty commits
2012-06-01Merge branch 'vr/rebase-autosquash-does-not-imply-i'Junio C Hamano
"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
2012-06-01Merge branch 'mm/levenstein-penalize-deletion-less'Junio C Hamano
"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)
2012-06-01Merge branch 'jl/submodule-report-new-path-once'Junio C Hamano
"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
2012-06-01Sync with maintJunio C Hamano
2012-06-01Start preparing for 1.7.10.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-01Merge branch 'ef/http-o-depends-on-gvf' into maintJunio C Hamano
A minor compilation fix. By Erik Faye-Lund * ef/http-o-depends-on-gvf: Makefile: add missing GIT-VERSION-FILE dependency
2012-06-01Merge git://github.com/git-l10n/git-poJunio C Hamano
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)
2012-06-01Merge branch 'rs/maint-grep-F' into maintJunio C Hamano
"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()
2012-06-01Merge branch 'jk/ident-split-fix' into maintJunio C Hamano
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
2012-06-01Merge branch 'jk/pretty-commit-header-incomplete-line' into maintJunio C Hamano
By Jeff King * jk/pretty-commit-header-incomplete-line: avoid segfault when reading header of malformed commits
2012-06-01Merge branch 'jk/format-person-part-buffer-limit' into maintJunio C Hamano
By Jeff King * jk/format-person-part-buffer-limit: pretty: avoid buffer overflow in format_person_part
2012-06-01Merge branch 'ap/checkout-no-progress-for-non-tty' into maintJunio C Hamano
"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).
2012-06-01Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano
By Peter Krefting via Peter Krefting * 'maint' of git://github.com/git-l10n/git-po: Update Swedish translation (728t0f0u)
2012-06-01i18n: apply: split to fix a partial i18n messageJiang Xin
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>
2012-06-01l10n: Set nplurals of zh_CN.po from 1 to 2Jiang Xin
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>
2012-06-01l10n: zh_CN.po: translate 323 new messagesJiang Xin
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>
2012-05-31Makefile: add missing GIT-VERSION-FILE dependencyErik Faye-Lund
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>
2012-05-31l10n: zh.CN.po: update by msgmerge git.potJiang Xin
Update of zh_CN.po: 134 fuzzy translations, 189 untranslated messages. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31First release translation for VietnameseTran Ngoc Quan
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2012-05-31Init translation for VietnameseTran Ngoc Quan
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-30Add persistent-https to contribColby Ranger
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>
2012-05-30rebase: report invalid commit correctlyErik Faye-Lund
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>
2012-05-30INSTALL: update asciidoc recommendationJeff King
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>
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 04:55:04 +0000